Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6448e7c authored by Romain Hunault's avatar Romain Hunault 💻
Browse files

Merge branch '688-WhatsApp_location_crash' into 'dev' 

Added setMapStyleOptions, updated some Parcels

See merge request e/apps/GmsApi!3
parents 09bf9494 cf52f8e4

.gitignore

+4 −0
Original line number Diff line number Diff line
@@ -3,3 +3,7 @@ build/ 
*.iml

local.properties

.gradle/

.classpath

.project

.settings/

bin/

play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IGoogleMapDelegate.aidl

+2 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import com.google.android.gms.maps.model.CircleOptions; 
import com.google.android.gms.maps.model.GroundOverlayOptions;

import com.google.android.gms.maps.model.LatLngBounds;

import com.google.android.gms.maps.model.MarkerOptions;

import com.google.android.gms.maps.model.MapStyleOptions;

import com.google.android.gms.maps.model.PolygonOptions;

import com.google.android.gms.maps.model.PolylineOptions;

import com.google.android.gms.maps.model.TileOverlayOptions;
@@ -125,7 +126,7 @@ interface IGoogleMapDelegate { 
    //void setPolylineClickListener(IOnPolylineClickListener listener) = 86;

    //void setCircleClickListener(IOnCircleClickListener listener) = 88;



    //boolean setMapStyle(in MapStyleOptions options) = 90;

    boolean setMapStyle(in MapStyleOptions options) = 90;

    void setMinZoomPreference(float minZoom) = 91;

    void setMaxZoomPreference(float maxZoom) = 92;

    void resetMinMaxZoomPreference() = 93;

play-services-api/src/main/aidl/com/google/android/gms/maps/model/MapStyleOptions.aidl

0 → 100644
+3 −0
Original line number Diff line number Diff line 
package com.google.android.gms.maps.model;



parcelable MapStyleOptions;

play-services-api/src/main/java/com/google/android/gms/maps/model/MapStyleOptions.java

0 → 100644
+47 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2020 e Foundation

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *     http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.google.android.gms.maps.model;



import android.os.IBinder;

import com.google.android.gms.dynamic.ObjectWrapper;



import org.microg.gms.common.PublicApi;

import org.microg.safeparcel.AutoSafeParcelable;

import org.microg.safeparcel.SafeParceled;



@PublicApi

public class MapStyleOptions extends AutoSafeParcelable {



    @SafeParceled(1)

    private int versionCode = 1;

    @SafeParceled(2)

    private String json;



    public MapStyleOptions() {

    }



    public MapStyleOptions (String json) {

        this.json = json;

    }



    public String getJson() {

        return this.json;

    }



    public static Creator<MapStyleOptions> CREATOR = new AutoCreator<MapStyleOptions>(MapStyleOptions.class);



}

play-services-location-api/src/main/java/com/google/android/gms/location/internal/LocationRequestInternal.java

+8 −0
Original line number Diff line number Diff line
@@ -52,6 +52,12 @@ public class LocationRequestInternal extends AutoSafeParcelable { 
    @SafeParceled(8)

    public boolean forceCoarseLocation;



    @SafeParceled(9)

    public boolean exemptFromThrottle;



    @SafeParceled(10)

    public String moduleId;



    @Override

    public String toString() {

        return "LocationRequestInternal{" +
@@ -63,6 +69,8 @@ public class LocationRequestInternal extends AutoSafeParcelable { 
                ", tag='" + tag + '\'' +

                ", hideFromAppOps=" + hideFromAppOps +

                ", forceCoarseLocation=" + forceCoarseLocation +

                ", exemptFromThrottle=" + exemptFromThrottle +

                ", moduleId=" + moduleId +

                '}';

    }