Merge "Deprecate location provider status callbacks" (176d5a22) · Commits · e / os / android_frameworks_base

api/current.txt

+7 −7

Original line number	Diff line number	Diff line
		@@ -22641,7 +22641,7 @@ package android.location {
		method public abstract void onLocationChanged(android.location.Location);
		method public abstract void onProviderDisabled(java.lang.String);
		method public abstract void onProviderEnabled(java.lang.String);
		method public abstract void onStatusChanged(java.lang.String, int, android.os.Bundle);
		method public abstract deprecated void onStatusChanged(java.lang.String, int, android.os.Bundle);
		}

		public class LocationManager {
		@@ -22653,7 +22653,7 @@ package android.location {
		method public void addTestProvider(java.lang.String, boolean, boolean, boolean, boolean, boolean, boolean, boolean, int, int);
		method public void clearTestProviderEnabled(java.lang.String);
		method public void clearTestProviderLocation(java.lang.String);
		method public void clearTestProviderStatus(java.lang.String);
		method public deprecated void clearTestProviderStatus(java.lang.String);
		method public java.util.List<java.lang.String> getAllProviders();
		method public java.lang.String getBestProvider(android.location.Criteria, boolean);
		method public java.lang.String getGnssHardwareModelName();
		@@ -22690,7 +22690,7 @@ package android.location {
		method public boolean sendExtraCommand(java.lang.String, java.lang.String, android.os.Bundle);
		method public void setTestProviderEnabled(java.lang.String, boolean);
		method public void setTestProviderLocation(java.lang.String, android.location.Location);
		method public void setTestProviderStatus(java.lang.String, int, android.os.Bundle, long);
		method public deprecated void setTestProviderStatus(java.lang.String, int, android.os.Bundle, long);
		method public void unregisterGnssMeasurementsCallback(android.location.GnssMeasurementsEvent.Callback);
		method public void unregisterGnssNavigationMessageCallback(android.location.GnssNavigationMessage.Callback);
		method public void unregisterGnssStatusCallback(android.location.GnssStatus.Callback);
		@@ -22698,7 +22698,7 @@ package android.location {
		field public static final java.lang.String KEY_LOCATION_CHANGED = "location";
		field public static final java.lang.String KEY_PROVIDER_ENABLED = "providerEnabled";
		field public static final java.lang.String KEY_PROXIMITY_ENTERING = "entering";
		field public static final java.lang.String KEY_STATUS_CHANGED = "status";
		field public static final deprecated java.lang.String KEY_STATUS_CHANGED = "status";
		field public static final java.lang.String MODE_CHANGED_ACTION = "android.location.MODE_CHANGED";
		field public static final java.lang.String NETWORK_PROVIDER = "network";
		field public static final java.lang.String PASSIVE_PROVIDER = "passive";
		@@ -22717,9 +22717,9 @@ package android.location {
		method public boolean supportsAltitude();
		method public boolean supportsBearing();
		method public boolean supportsSpeed();
		field public static final int AVAILABLE = 2; // 0x2
		field public static final int OUT_OF_SERVICE = 0; // 0x0
		field public static final int TEMPORARILY_UNAVAILABLE = 1; // 0x1
		field public static final deprecated int AVAILABLE = 2; // 0x2
		field public static final deprecated int OUT_OF_SERVICE = 0; // 0x0
		field public static final deprecated int TEMPORARILY_UNAVAILABLE = 1; // 0x1
		}

		public abstract interface OnNmeaMessageListener {

core/java/android/provider/Settings.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -9338,6 +9338,13 @@ public final class Settings {
		public static final String LOCATION_BACKGROUND_THROTTLE_PACKAGE_WHITELIST =
		"location_background_throttle_package_whitelist";

		/**
		* Whether to disable location status callbacks in preparation for deprecation.
		* @hide
		*/
		public static final String LOCATION_DISABLE_STATUS_CALLBACKS =
		"location_disable_status_callbacks";

		/**
		* Maximum staleness allowed for last location when returned to clients with only foreground
		* location permissions.

core/tests/coretests/src/android/provider/SettingsBackupTest.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -283,6 +283,7 @@ public class SettingsBackupTest {
		Settings.Global.LOCATION_BACKGROUND_THROTTLE_INTERVAL_MS,
		Settings.Global.LOCATION_BACKGROUND_THROTTLE_PROXIMITY_ALERT_INTERVAL_MS,
		Settings.Global.LOCATION_BACKGROUND_THROTTLE_PACKAGE_WHITELIST,
		Settings.Global.LOCATION_DISABLE_STATUS_CALLBACKS,
		Settings.Global.LOCATION_LAST_LOCATION_MAX_AGE_MILLIS,
		Settings.Global.LOCATION_GLOBAL_KILL_SWITCH,
		Settings.Global.LOCATION_SETTINGS_LINK_TO_PERMISSIONS_ENABLED,

location/java/android/location/ILocationListener.aidl

+3 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,9 @@ import android.os.Bundle;
		oneway interface ILocationListener
		{
		void onLocationChanged(in Location location);
		void onStatusChanged(String provider, int status, in Bundle extras);
		void onProviderEnabled(String provider);
		void onProviderDisabled(String provider);

		// --- deprecated ---
		void onStatusChanged(String provider, int status, in Bundle extras);
		}

location/java/android/location/ILocationManager.aidl

+2 −1

Original line number	Diff line number	Diff line
		@@ -99,9 +99,10 @@ interface ILocationManager
		void clearTestProviderLocation(String provider, String opPackageName);
		void setTestProviderEnabled(String provider, boolean enabled, String opPackageName);
		void clearTestProviderEnabled(String provider, String opPackageName);

		// --- deprecated ---
		void setTestProviderStatus(String provider, int status, in Bundle extras, long updateTime,
		String opPackageName);
		void clearTestProviderStatus(String provider, String opPackageName);

		boolean sendExtraCommand(String provider, String command, inout Bundle extras);