Don't null a param which is still used, stub for missing function. Fixes #1126. (5839489b) · Commits · e / os / GmsCore

play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/GoogleMap.kt

+9 −1

Original line number	Diff line number	Diff line
		@@ -223,6 +223,11 @@ class GoogleMapImpl(private val context: Context, var options: GoogleMapOptions)

		override fun stopAnimation() = map?.cancelTransitions() ?: Unit

		override fun setMapStyle(options: MapStyleOptions?): Boolean {
		Log.d(TAG, "setMapStyle options: " + options?.getJson())
		return true
		}

		override fun setMinZoomPreference(minZoom: Float) {
		map?.setMinZoomPreference(minZoom.toDouble() - 1)
		}
		@@ -719,7 +724,10 @@ class GoogleMapImpl(private val context: Context, var options: GoogleMapOptions)
		// TODO can crash?
		mapView?.onDestroy()
		mapView = null
		map = null

		// Don't make it null; this object is not deleted immediately, and it may want to access map.* stuff
		//map = null

		created = false
		initialized = false
		loaded = false

+7 −0

Original line number	Diff line number	Diff line
		@@ -60,6 +60,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;
		@@ -211,6 +212,12 @@ public class GoogleMapImpl extends IGoogleMapDelegate.Stub

		}

		@Override
		public boolean setMapStyle(MapStyleOptions options) throws RemoteException {
		Log.d(TAG, "unimplemented Method: setMapStyle");
		return true;
		}

		@Override
		public void setMinZoomPreference(float minZoom) throws RemoteException {
		Log.d(TAG, "unimplemented Method: setMinZoomPreference");