Merge "Copy LocationProviderBase API into SystemApi surface" (3993456b) · Commits · e / os / android_frameworks_base

config/hiddenapi-temp-blocklist.txt

+0 −3

Original line number	Diff line number	Diff line
		@@ -47,9 +47,6 @@ Lcom/android/ims/internal/uce/uceservice/IUceListener$Stub;-><init>()V
		Lcom/android/ims/internal/uce/uceservice/IUceService$Stub;-><init>()V
		Lcom/android/internal/app/IVoiceInteractionManagerService$Stub$Proxy;->showSessionFromSession(Landroid/os/IBinder;Landroid/os/Bundle;I)Z
		Lcom/android/internal/appwidget/IAppWidgetService$Stub;->TRANSACTION_bindAppWidgetId:I
		Lcom/android/internal/location/ILocationProvider$Stub;-><init>()V
		Lcom/android/internal/location/ILocationProviderManager$Stub;-><init>()V
		Lcom/android/internal/location/ILocationProviderManager$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/location/ILocationProviderManager;
		Lcom/android/internal/telephony/ITelephony$Stub;->DESCRIPTOR:Ljava/lang/String;
		Lcom/android/internal/telephony/ITelephony$Stub;->TRANSACTION_dial:I
		Lcom/android/internal/widget/IRemoteViewsFactory$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/widget/IRemoteViewsFactory;

config/hiddenapi-unsupported.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -269,7 +269,6 @@ Lcom/android/internal/app/IMediaContainerService$Stub;->asInterface(Landroid/os/
		Lcom/android/internal/app/IVoiceInteractionManagerService$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/app/IVoiceInteractionManagerService;
		Lcom/android/internal/appwidget/IAppWidgetService$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/appwidget/IAppWidgetService;
		Lcom/android/internal/backup/IBackupTransport$Stub;-><init>()V
		Lcom/android/internal/location/ILocationProvider$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/location/ILocationProvider;
		Lcom/android/internal/os/IDropBoxManagerService$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/os/IDropBoxManagerService;
		Lcom/android/internal/policy/IKeyguardService$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/policy/IKeyguardService;
		Lcom/android/internal/policy/IKeyguardStateCallback$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/policy/IKeyguardStateCallback;

core/api/current.txt

+34 −14

Original line number	Diff line number	Diff line
		@@ -19320,6 +19320,7 @@ package android.location {
		method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public boolean addNmeaListener(@NonNull java.util.concurrent.Executor, @NonNull android.location.OnNmeaMessageListener);
		method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void addProximityAlert(double, double, float, long, @NonNull android.app.PendingIntent);
		method public void addTestProvider(@NonNull String, boolean, boolean, boolean, boolean, boolean, boolean, boolean, int, int);
		method public void addTestProvider(@NonNull String, @NonNull android.location.provider.ProviderProperties);
		method @Deprecated public void clearTestProviderEnabled(@NonNull String);
		method @Deprecated public void clearTestProviderLocation(@NonNull String);
		method @Deprecated public void clearTestProviderStatus(@NonNull String);
		@@ -19334,7 +19335,7 @@ package android.location {
		method @Deprecated @Nullable @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public android.location.GpsStatus getGpsStatus(@Nullable android.location.GpsStatus);
		method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public android.location.Location getLastKnownLocation(@NonNull String);
		method @Deprecated @Nullable public android.location.LocationProvider getProvider(@NonNull String);
		method @Nullable public android.location.ProviderProperties getProviderProperties(@NonNull String);
		method @Nullable public android.location.provider.ProviderProperties getProviderProperties(@NonNull String);
		method @NonNull public java.util.List<java.lang.String> getProviders(boolean);
		method @NonNull public java.util.List<java.lang.String> getProviders(@NonNull android.location.Criteria, boolean);
		method public boolean hasProvider(@NonNull String);
		@@ -19466,6 +19467,24 @@ package android.location {
		method public void onNmeaMessage(String, long);
		}

		public abstract class SettingInjectorService extends android.app.Service {
		ctor public SettingInjectorService(String);
		method public final android.os.IBinder onBind(android.content.Intent);
		method protected abstract boolean onGetEnabled();
		method protected abstract String onGetSummary();
		method public final void onStart(android.content.Intent, int);
		method public final int onStartCommand(android.content.Intent, int, int);
		method public static final void refreshSettings(@NonNull android.content.Context);
		field public static final String ACTION_INJECTED_SETTING_CHANGED = "android.location.InjectedSettingChanged";
		field public static final String ACTION_SERVICE_INTENT = "android.location.SettingInjectorService";
		field public static final String ATTRIBUTES_NAME = "injected-location-setting";
		field public static final String META_DATA_NAME = "android.location.SettingInjectorService";
		}

		}

		package android.location.provider {

		public final class ProviderProperties implements android.os.Parcelable {
		method public int describeContents();
		method public int getAccuracy();
		@@ -19480,24 +19499,25 @@ package android.location {
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field public static final int ACCURACY_COARSE = 2; // 0x2
		field public static final int ACCURACY_FINE = 1; // 0x1
		field @NonNull public static final android.os.Parcelable.Creator<android.location.ProviderProperties> CREATOR;
		field @NonNull public static final android.os.Parcelable.Creator<android.location.provider.ProviderProperties> CREATOR;
		field public static final int POWER_USAGE_HIGH = 3; // 0x3
		field public static final int POWER_USAGE_LOW = 1; // 0x1
		field public static final int POWER_USAGE_MEDIUM = 2; // 0x2
		}

		public abstract class SettingInjectorService extends android.app.Service {
		ctor public SettingInjectorService(String);
		method public final android.os.IBinder onBind(android.content.Intent);
		method protected abstract boolean onGetEnabled();
		method protected abstract String onGetSummary();
		method public final void onStart(android.content.Intent, int);
		method public final int onStartCommand(android.content.Intent, int, int);
		method public static final void refreshSettings(@NonNull android.content.Context);
		field public static final String ACTION_INJECTED_SETTING_CHANGED = "android.location.InjectedSettingChanged";
		field public static final String ACTION_SERVICE_INTENT = "android.location.SettingInjectorService";
		field public static final String ATTRIBUTES_NAME = "injected-location-setting";
		field public static final String META_DATA_NAME = "android.location.SettingInjectorService";
		public static final class ProviderProperties.Builder {
		ctor public ProviderProperties.Builder();
		ctor public ProviderProperties.Builder(@NonNull android.location.provider.ProviderProperties);
		method @NonNull public android.location.provider.ProviderProperties build();
		method @NonNull public android.location.provider.ProviderProperties.Builder setAccuracy(int);
		method @NonNull public android.location.provider.ProviderProperties.Builder setHasAltitudeSupport(boolean);
		method @NonNull public android.location.provider.ProviderProperties.Builder setHasBearingSupport(boolean);
		method @NonNull public android.location.provider.ProviderProperties.Builder setHasCellRequirement(boolean);
		method @NonNull public android.location.provider.ProviderProperties.Builder setHasMonetaryCost(boolean);
		method @NonNull public android.location.provider.ProviderProperties.Builder setHasNetworkRequirement(boolean);
		method @NonNull public android.location.provider.ProviderProperties.Builder setHasSatelliteRequirement(boolean);
		method @NonNull public android.location.provider.ProviderProperties.Builder setHasSpeedSupport(boolean);
		method @NonNull public android.location.provider.ProviderProperties.Builder setPowerUsage(int);
		}

		}

core/api/system-current.txt

+50 −0

Original line number	Diff line number	Diff line
		@@ -4382,6 +4382,56 @@ package android.location {

		}

		package android.location.provider {

		public abstract class LocationProviderBase {
		ctor public LocationProviderBase(@NonNull android.content.Context, @NonNull String, @NonNull android.location.provider.ProviderProperties);
		method @Nullable public final android.os.IBinder getBinder();
		method @NonNull public android.location.provider.ProviderProperties getProperties();
		method public boolean isAllowed();
		method public abstract void onFlush(@NonNull android.location.provider.LocationProviderBase.OnFlushCompleteCallback);
		method public abstract void onSendExtraCommand(@NonNull String, @Nullable android.os.Bundle);
		method public abstract void onSetRequest(@NonNull android.location.provider.ProviderRequest);
		method public void reportLocation(@NonNull android.location.Location);
		method public void reportLocation(@NonNull android.location.LocationResult);
		method public void setAllowed(boolean);
		method public void setProperties(@NonNull android.location.provider.ProviderProperties);
		field public static final String ACTION_FUSED_PROVIDER = "com.android.location.service.FusedLocationProvider";
		field public static final String ACTION_NETWORK_PROVIDER = "com.android.location.service.v3.NetworkLocationProvider";
		}

		public static interface LocationProviderBase.OnFlushCompleteCallback {
		method public void onFlushComplete();
		}

		public final class ProviderRequest implements android.os.Parcelable {
		method public int describeContents();
		method @IntRange(from=0) public long getIntervalMillis();
		method @IntRange(from=0) public long getMaxUpdateDelayMillis();
		method public int getQuality();
		method @NonNull public android.os.WorkSource getWorkSource();
		method public boolean isActive();
		method public boolean isLocationSettingsIgnored();
		method public boolean isLowPower();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.location.provider.ProviderRequest> CREATOR;
		field @NonNull public static final android.location.provider.ProviderRequest EMPTY_REQUEST;
		field public static final long INTERVAL_DISABLED = 9223372036854775807L; // 0x7fffffffffffffffL
		}

		public static final class ProviderRequest.Builder {
		ctor public ProviderRequest.Builder();
		method @NonNull public android.location.provider.ProviderRequest build();
		method @NonNull public android.location.provider.ProviderRequest.Builder setIntervalMillis(@IntRange(from=0) long);
		method @NonNull public android.location.provider.ProviderRequest.Builder setLocationSettingsIgnored(boolean);
		method @NonNull public android.location.provider.ProviderRequest.Builder setLowPower(boolean);
		method @NonNull public android.location.provider.ProviderRequest.Builder setMaxUpdateDelayMillis(@IntRange(from=0) long);
		method @NonNull public android.location.provider.ProviderRequest.Builder setQuality(int);
		method @NonNull public android.location.provider.ProviderRequest.Builder setWorkSource(@NonNull android.os.WorkSource);
		}

		}

		package android.media {

		public final class AudioAttributes implements android.os.Parcelable {

location/java/android/location/ILocationManager.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@ import android.location.LastLocationRequest;
		import android.location.Location;
		import android.location.LocationRequest;
		import android.location.LocationTime;
		import android.location.ProviderProperties;
		import android.location.provider.ProviderProperties;
		import android.os.Bundle;
		import android.os.ICancellationSignal;