Merge "Make LocationRequest a public API" (7926062e) · Commits · e / os / android_frameworks_base

apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java

+3 −4

Original line number	Diff line number	Diff line
		@@ -2178,11 +2178,10 @@ public class DeviceIdleController extends SystemService

		if (getContext().getResources().getBoolean(
		com.android.internal.R.bool.config_autoPowerModePrefetchLocation)) {
		mLocationRequest = LocationRequest.create()
		mLocationRequest = new LocationRequest.Builder(/intervalMillis=/ 0)
		.setQuality(LocationRequest.ACCURACY_FINE)
		.setInterval(0)
		.setFastestInterval(0)
		.setNumUpdates(1);
		.setMaxUpdates(1)
		.build();
		}

		mConstraintController = mInjector.getConstraintController(

api/current.txt

+27 −0

Original line number	Diff line number	Diff line
		@@ -23916,6 +23916,7 @@ package android.location {
		method @NonNull public java.util.List<java.lang.String> getAllProviders();
		method @Nullable public String getBestProvider(@NonNull android.location.Criteria, boolean);
		method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void getCurrentLocation(@NonNull String, @Nullable android.os.CancellationSignal, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<android.location.Location>);
		method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void getCurrentLocation(@NonNull String, @NonNull android.location.LocationRequest, @Nullable android.os.CancellationSignal, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<android.location.Location>);
		method @NonNull public android.location.GnssCapabilities getGnssCapabilities();
		method @Nullable public String getGnssHardwareModelName();
		method public int getGnssYearOfHardware();
		@@ -23950,6 +23951,8 @@ package android.location {
		method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void requestLocationUpdates(long, float, @NonNull android.location.Criteria, @NonNull java.util.concurrent.Executor, @NonNull android.location.LocationListener);
		method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void requestLocationUpdates(@NonNull String, long, float, @NonNull android.app.PendingIntent);
		method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void requestLocationUpdates(long, float, @NonNull android.location.Criteria, @NonNull android.app.PendingIntent);
		method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void requestLocationUpdates(@NonNull String, @NonNull android.location.LocationRequest, @NonNull java.util.concurrent.Executor, @NonNull android.location.LocationListener);
		method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void requestLocationUpdates(@NonNull String, @NonNull android.location.LocationRequest, @NonNull android.app.PendingIntent);
		method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void requestSingleUpdate(@NonNull String, @NonNull android.location.LocationListener, @Nullable android.os.Looper);
		method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void requestSingleUpdate(@NonNull android.location.Criteria, @NonNull android.location.LocationListener, @Nullable android.os.Looper);
		method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void requestSingleUpdate(@NonNull String, @NonNull android.app.PendingIntent);
		@@ -23993,6 +23996,30 @@ package android.location {
		field @Deprecated public static final int TEMPORARILY_UNAVAILABLE = 1; // 0x1
		}

		public final class LocationRequest implements android.os.Parcelable {
		method public int describeContents();
		method public long getDurationMillis();
		method public long getIntervalMillis();
		method public int getMaxUpdates();
		method public float getMinUpdateDistanceMeters();
		method public long getMinUpdateIntervalMillis();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.location.LocationRequest> CREATOR;
		field public static final long PASSIVE_INTERVAL = 9223372036854775807L; // 0x7fffffffffffffffL
		}

		public static final class LocationRequest.Builder {
		ctor public LocationRequest.Builder(long);
		ctor public LocationRequest.Builder(@NonNull android.location.LocationRequest);
		method @NonNull public android.location.LocationRequest build();
		method @NonNull public android.location.LocationRequest.Builder clearMinUpdateIntervalMillis();
		method @NonNull public android.location.LocationRequest.Builder setDurationMillis(@IntRange(from=1) long);
		method @NonNull public android.location.LocationRequest.Builder setIntervalMillis(@IntRange(from=0) long);
		method @NonNull public android.location.LocationRequest.Builder setMaxUpdates(@IntRange(from=1, to=java.lang.Integer.MAX_VALUE) int);
		method @NonNull public android.location.LocationRequest.Builder setMinUpdateDistanceMeters(@FloatRange(from=0, to=java.lang.Float.MAX_VALUE) float);
		method @NonNull public android.location.LocationRequest.Builder setMinUpdateIntervalMillis(@IntRange(from=0) long);
		}

		public interface OnNmeaMessageListener {
		method public void onNmeaMessage(String, long);
		}

api/system-current.txt

+37 −30

Original line number	Diff line number	Diff line
		@@ -4075,7 +4075,7 @@ package android.location {

		public class LocationManager {
		method @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public void flushGnssBatch();
		method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void getCurrentLocation(@NonNull android.location.LocationRequest, @Nullable android.os.CancellationSignal, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<android.location.Location>);
		method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void getCurrentLocation(@NonNull android.location.LocationRequest, @Nullable android.os.CancellationSignal, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<android.location.Location>);
		method @Nullable public String getExtraLocationControllerPackage();
		method @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public int getGnssBatchSize();
		method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public void injectGnssMeasurementCorrections(@NonNull android.location.GnssMeasurementCorrections);
		@@ -4086,9 +4086,9 @@ package android.location {
		method @RequiresPermission(android.Manifest.permission.READ_DEVICE_CONFIG) public boolean isProviderPackage(@Nullable String, @NonNull String);
		method @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public boolean registerGnssBatchedLocationCallback(long, boolean, @NonNull android.location.BatchedLocationCallback, @Nullable android.os.Handler);
		method @RequiresPermission(allOf={android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.LOCATION_HARDWARE}) public boolean registerGnssMeasurementsCallback(@NonNull android.location.GnssRequest, @NonNull java.util.concurrent.Executor, @NonNull android.location.GnssMeasurementsEvent.Callback);
		method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void requestLocationUpdates(@Nullable android.location.LocationRequest, @NonNull android.location.LocationListener, @Nullable android.os.Looper);
		method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void requestLocationUpdates(@Nullable android.location.LocationRequest, @NonNull java.util.concurrent.Executor, @NonNull android.location.LocationListener);
		method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void requestLocationUpdates(@Nullable android.location.LocationRequest, @NonNull android.app.PendingIntent);
		method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void requestLocationUpdates(@Nullable android.location.LocationRequest, @NonNull android.location.LocationListener, @Nullable android.os.Looper);
		method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void requestLocationUpdates(@Nullable android.location.LocationRequest, @NonNull java.util.concurrent.Executor, @NonNull android.location.LocationListener);
		method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void requestLocationUpdates(@Nullable android.location.LocationRequest, @NonNull android.app.PendingIntent);
		method @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public void setExtraLocationControllerPackage(@Nullable String);
		method @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public void setExtraLocationControllerPackageEnabled(boolean);
		method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public void setLocationEnabledForUser(boolean, @NonNull android.os.UserHandle);
		@@ -4097,42 +4097,49 @@ package android.location {
		}

		public final class LocationRequest implements android.os.Parcelable {
		method @NonNull public static android.location.LocationRequest create();
		method @NonNull public static android.location.LocationRequest createFromDeprecatedCriteria(@NonNull android.location.Criteria, long, float, boolean);
		method @NonNull public static android.location.LocationRequest createFromDeprecatedProvider(@NonNull String, long, float, boolean);
		method public int describeContents();
		method @Deprecated @NonNull public static android.location.LocationRequest create();
		method @Deprecated @NonNull public static android.location.LocationRequest createFromDeprecatedCriteria(@NonNull android.location.Criteria, long, float, boolean);
		method @Deprecated @NonNull public static android.location.LocationRequest createFromDeprecatedProvider(@NonNull String, long, float, boolean);
		method @Deprecated public long getExpireAt();
		method public long getExpireIn();
		method public long getFastestInterval();
		method public boolean getHideFromAppOps();
		method public long getInterval();
		method public int getNumUpdates();
		method @NonNull public String getProvider();
		method @Deprecated public long getExpireIn();
		method @Deprecated public long getFastestInterval();
		method @Deprecated public boolean getHideFromAppOps();
		method @Deprecated public long getInterval();
		method @Deprecated public int getNumUpdates();
		method @Deprecated @NonNull public String getProvider();
		method public int getQuality();
		method public float getSmallestDisplacement();
		method @Deprecated public float getSmallestDisplacement();
		method @Nullable public android.os.WorkSource getWorkSource();
		method public boolean isHiddenFromAppOps();
		method public boolean isLocationSettingsIgnored();
		method public boolean isLowPowerMode();
		method public boolean isLowPower();
		method @Deprecated public boolean isLowPowerMode();
		method @Deprecated @NonNull public android.location.LocationRequest setExpireAt(long);
		method @NonNull public android.location.LocationRequest setExpireIn(long);
		method @NonNull public android.location.LocationRequest setFastestInterval(long);
		method public void setHideFromAppOps(boolean);
		method @NonNull public android.location.LocationRequest setInterval(long);
		method @NonNull @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public android.location.LocationRequest setLocationSettingsIgnored(boolean);
		method @NonNull public android.location.LocationRequest setLowPowerMode(boolean);
		method @NonNull public android.location.LocationRequest setNumUpdates(int);
		method @NonNull public android.location.LocationRequest setProvider(@NonNull String);
		method @NonNull public android.location.LocationRequest setQuality(int);
		method @NonNull public android.location.LocationRequest setSmallestDisplacement(float);
		method public void setWorkSource(@Nullable android.os.WorkSource);
		method public void writeToParcel(android.os.Parcel, int);
		method @Deprecated @NonNull public android.location.LocationRequest setExpireIn(long);
		method @Deprecated @NonNull public android.location.LocationRequest setFastestInterval(long);
		method @Deprecated public void setHideFromAppOps(boolean);
		method @Deprecated @NonNull public android.location.LocationRequest setInterval(long);
		method @Deprecated @NonNull @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public android.location.LocationRequest setLocationSettingsIgnored(boolean);
		method @Deprecated @NonNull public android.location.LocationRequest setLowPowerMode(boolean);
		method @Deprecated @NonNull public android.location.LocationRequest setNumUpdates(int);
		method @Deprecated @NonNull public android.location.LocationRequest setProvider(@NonNull String);
		method @Deprecated @NonNull public android.location.LocationRequest setQuality(int);
		method @Deprecated @NonNull public android.location.LocationRequest setSmallestDisplacement(float);
		method @Deprecated public void setWorkSource(@Nullable android.os.WorkSource);
		field public static final int ACCURACY_BLOCK = 102; // 0x66
		field public static final int ACCURACY_CITY = 104; // 0x68
		field public static final int ACCURACY_FINE = 100; // 0x64
		field @NonNull public static final android.os.Parcelable.Creator<android.location.LocationRequest> CREATOR;
		field public static final int POWER_HIGH = 203; // 0xcb
		field public static final int POWER_LOW = 201; // 0xc9
		field public static final int POWER_NONE = 200; // 0xc8
		field @Deprecated public static final int POWER_NONE = 200; // 0xc8
		}

		public static final class LocationRequest.Builder {
		method @NonNull @RequiresPermission(android.Manifest.permission.UPDATE_APP_OPS_STATS) public android.location.LocationRequest.Builder setHiddenFromAppOps(boolean);
		method @NonNull @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public android.location.LocationRequest.Builder setLocationSettingsIgnored(boolean);
		method @NonNull @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public android.location.LocationRequest.Builder setLowPower(boolean);
		method @NonNull public android.location.LocationRequest.Builder setQuality(int);
		method @NonNull @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public android.location.LocationRequest.Builder setWorkSource(@Nullable android.os.WorkSource);
		}

		}

api/test-current.txt

+14 −25

Original line number	Diff line number	Diff line
		@@ -1686,45 +1686,34 @@ package android.location {

		public class LocationManager {
		method @NonNull public String[] getBackgroundThrottlingWhitelist();
		method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void getCurrentLocation(@NonNull android.location.LocationRequest, @Nullable android.os.CancellationSignal, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<android.location.Location>);
		method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void getCurrentLocation(@NonNull android.location.LocationRequest, @Nullable android.os.CancellationSignal, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<android.location.Location>);
		method @NonNull public String[] getIgnoreSettingsWhitelist();
		method @Deprecated @Nullable @RequiresPermission("android.permission.READ_DEVICE_CONFIG") public java.util.List<java.lang.String> getProviderPackages(@NonNull String);
		method @NonNull public java.util.List<android.location.LocationRequest> getTestProviderCurrentRequests(String);
		method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void requestLocationUpdates(@Nullable android.location.LocationRequest, @NonNull android.location.LocationListener, @Nullable android.os.Looper);
		method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void requestLocationUpdates(@Nullable android.location.LocationRequest, @NonNull java.util.concurrent.Executor, @NonNull android.location.LocationListener);
		method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void requestLocationUpdates(@Nullable android.location.LocationRequest, @NonNull android.app.PendingIntent);
		method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void requestLocationUpdates(@Nullable android.location.LocationRequest, @NonNull android.location.LocationListener, @Nullable android.os.Looper);
		method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void requestLocationUpdates(@Nullable android.location.LocationRequest, @NonNull java.util.concurrent.Executor, @NonNull android.location.LocationListener);
		method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void requestLocationUpdates(@Nullable android.location.LocationRequest, @NonNull android.app.PendingIntent);
		method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public void setLocationEnabledForUser(boolean, @NonNull android.os.UserHandle);
		field public static final String FUSED_PROVIDER = "fused";
		}

		public final class LocationRequest implements android.os.Parcelable {
		method @NonNull public static android.location.LocationRequest create();
		method public int describeContents();
		method @Deprecated public long getExpireAt();
		method public long getExpireIn();
		method public long getFastestInterval();
		method public long getInterval();
		method public int getNumUpdates();
		method public int getQuality();
		method @Nullable public android.os.WorkSource getWorkSource();
		method public boolean isHiddenFromAppOps();
		method public boolean isLocationSettingsIgnored();
		method public boolean isLowPowerMode();
		method @Deprecated @NonNull public android.location.LocationRequest setExpireAt(long);
		method @NonNull public android.location.LocationRequest setExpireIn(long);
		method @NonNull public android.location.LocationRequest setFastestInterval(long);
		method @NonNull public android.location.LocationRequest setInterval(long);
		method @NonNull @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public android.location.LocationRequest setLocationSettingsIgnored(boolean);
		method @NonNull public android.location.LocationRequest setLowPowerMode(boolean);
		method @NonNull public android.location.LocationRequest setNumUpdates(int);
		method @NonNull public android.location.LocationRequest setProvider(@NonNull String);
		method @NonNull public android.location.LocationRequest setQuality(int);
		method public void writeToParcel(android.os.Parcel, int);
		method public boolean isLowPower();
		field public static final int ACCURACY_BLOCK = 102; // 0x66
		field public static final int ACCURACY_CITY = 104; // 0x68
		field public static final int ACCURACY_FINE = 100; // 0x64
		field @NonNull public static final android.os.Parcelable.Creator<android.location.LocationRequest> CREATOR;
		field public static final int POWER_HIGH = 203; // 0xcb
		field public static final int POWER_LOW = 201; // 0xc9
		field public static final int POWER_NONE = 200; // 0xc8
		}

		public static final class LocationRequest.Builder {
		method @NonNull @RequiresPermission("android.permission.UPDATE_APP_OPS_STATS") public android.location.LocationRequest.Builder setHiddenFromAppOps(boolean);
		method @NonNull @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public android.location.LocationRequest.Builder setLocationSettingsIgnored(boolean);
		method @NonNull @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public android.location.LocationRequest.Builder setLowPower(boolean);
		method @NonNull @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public android.location.LocationRequest.Builder setWorkSource(@Nullable android.os.WorkSource);
		}

		}

location/java/android/location/ILocationManager.aidl

+4 −4

Original line number	Diff line number	Diff line
		@@ -46,13 +46,13 @@ import com.android.internal.location.ProviderProperties;
		*/
		interface ILocationManager
		{
		Location getLastLocation(in LocationRequest request, String packageName, String attributionTag);
		void getCurrentLocation(in LocationRequest request, in ICancellationSignal cancellationSignal, in ILocationCallback callback, String packageName, String attributionTag, String listenerId);
		Location getLastLocation(String provider, String packageName, String attributionTag);
		void getCurrentLocation(String provider, in LocationRequest request, in ICancellationSignal cancellationSignal, in ILocationCallback callback, String packageName, String attributionTag, String listenerId);

		void registerLocationListener(in LocationRequest request, in ILocationListener listener, String packageName, String attributionTag, String listenerId);
		void registerLocationListener(String provider, in LocationRequest request, in ILocationListener listener, String packageName, String attributionTag, String listenerId);
		void unregisterLocationListener(in ILocationListener listener);

		void registerLocationPendingIntent(in LocationRequest request, in PendingIntent intent, String packageName, String attributionTag);
		void registerLocationPendingIntent(String provider, in LocationRequest request, in PendingIntent intent, String packageName, String attributionTag);
		void unregisterLocationPendingIntent(in PendingIntent intent);

		void requestGeofence(in Geofence geofence, in PendingIntent intent, String packageName, String attributionTag);