summaryrefslogtreecommitdiff
path: root/location/java
diff options
context:
space:
mode:
author Soonil Nagarkar <sooniln@google.com> 2021-03-01 16:26:21 -0800
committer Soonil Nagarkar <sooniln@google.com> 2021-03-22 20:27:31 -0700
commitc257baefb5758f895c52b520d9d772225c067e14 (patch)
tree530938cb055065355888f6c3a6e44ce4b129cc6b /location/java
parent74882cf536a560d23a1cf422faee8c15e1cda763 (diff)
Refactor ServiceWatcher
Split it up into more generic and useable components that are not as location specific. Bug: 182491144 Bug: 181665909 Test: presubmits Change-Id: I2d6d5e70328657a7430e170531402cb3acbed028
Diffstat (limited to 'location/java')
-rw-r--r--location/java/android/location/provider/ILocationProviderManager.aidl2
-rw-r--r--location/java/android/location/provider/LocationProviderBase.java4
2 files changed, 2 insertions, 4 deletions
diff --git a/location/java/android/location/provider/ILocationProviderManager.aidl b/location/java/android/location/provider/ILocationProviderManager.aidl
index 50ed046f09cd..092ec67ff146 100644
--- a/location/java/android/location/provider/ILocationProviderManager.aidl
+++ b/location/java/android/location/provider/ILocationProviderManager.aidl
@@ -24,7 +24,7 @@ import android.location.provider.ProviderProperties;
* @hide
*/
interface ILocationProviderManager {
- void onInitialize(boolean allowed, in ProviderProperties properties, @nullable String packageName, @nullable String attributionTag);
+ void onInitialize(boolean allowed, in ProviderProperties properties, @nullable String attributionTag);
void onSetAllowed(boolean allowed);
void onSetProperties(in ProviderProperties properties);
diff --git a/location/java/android/location/provider/LocationProviderBase.java b/location/java/android/location/provider/LocationProviderBase.java
index ae6395d5d12d..eada22cd94dc 100644
--- a/location/java/android/location/provider/LocationProviderBase.java
+++ b/location/java/android/location/provider/LocationProviderBase.java
@@ -96,7 +96,6 @@ public abstract class LocationProviderBase {
"com.android.location.service.FusedLocationProvider";
private final String mTag;
- private final @Nullable String mPackageName;
private final @Nullable String mAttributionTag;
private final IBinder mBinder;
@@ -108,7 +107,6 @@ public abstract class LocationProviderBase {
public LocationProviderBase(@NonNull Context context, @NonNull String tag,
@NonNull ProviderProperties properties) {
mTag = tag;
- mPackageName = context.getPackageName();
mAttributionTag = context.getAttributionTag();
mBinder = new Service();
@@ -305,7 +303,7 @@ public abstract class LocationProviderBase {
public void setLocationProviderManager(ILocationProviderManager manager) {
synchronized (mBinder) {
try {
- manager.onInitialize(mAllowed, mProperties, mPackageName, mAttributionTag);
+ manager.onInitialize(mAllowed, mProperties, mAttributionTag);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
} catch (RuntimeException e) {