From c2f95bbfdd30a20894f9518e733e54ad662a6cbc Mon Sep 17 00:00:00 2001
From: Alexandru Chircu <alexch@e.email>
Date: Wed, 5 Aug 2020 08:19:24 +0000
Subject: [PATCH] Added setMapStyleOptions, updated some Parcels

---
 .../gms/maps/internal/IGoogleMapDelegate.aidl |  3 +-
 .../gms/maps/model/MapStyleOptions.aidl       |  3 ++
 .../gms/maps/model/MapStyleOptions.java       | 47 +++++++++++++++++++
 .../internal/LocationRequestInternal.java     |  8 ++++
 4 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 play-services-api/src/main/aidl/com/google/android/gms/maps/model/MapStyleOptions.aidl
 create mode 100644 play-services-api/src/main/java/com/google/android/gms/maps/model/MapStyleOptions.java

diff --git a/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IGoogleMapDelegate.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IGoogleMapDelegate.aidl
index b8866644..af44f1c5 100644
--- a/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IGoogleMapDelegate.aidl
+++ b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IGoogleMapDelegate.aidl
@@ -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;
diff --git a/play-services-api/src/main/aidl/com/google/android/gms/maps/model/MapStyleOptions.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/model/MapStyleOptions.aidl
new file mode 100644
index 00000000..04312ebf
--- /dev/null
+++ b/play-services-api/src/main/aidl/com/google/android/gms/maps/model/MapStyleOptions.aidl
@@ -0,0 +1,3 @@
+package com.google.android.gms.maps.model;
+
+parcelable MapStyleOptions;
diff --git a/play-services-api/src/main/java/com/google/android/gms/maps/model/MapStyleOptions.java b/play-services-api/src/main/java/com/google/android/gms/maps/model/MapStyleOptions.java
new file mode 100644
index 00000000..c2ebb01d
--- /dev/null
+++ b/play-services-api/src/main/java/com/google/android/gms/maps/model/MapStyleOptions.java
@@ -0,0 +1,47 @@
+/*
+ * 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);
+
+}
diff --git a/play-services-location-api/src/main/java/com/google/android/gms/location/internal/LocationRequestInternal.java b/play-services-location-api/src/main/java/com/google/android/gms/location/internal/LocationRequestInternal.java
index c803a841..dd70d96a 100644
--- a/play-services-location-api/src/main/java/com/google/android/gms/location/internal/LocationRequestInternal.java
+++ b/play-services-location-api/src/main/java/com/google/android/gms/location/internal/LocationRequestInternal.java
@@ -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 +
                 '}';
     }