diff options
author | Philip P. Moltmann <moltmann@google.com> | 2020-03-05 15:01:29 -0800 |
---|---|---|
committer | Philip P. Moltmann <moltmann@google.com> | 2020-03-12 19:26:10 +0000 |
commit | 12ac3f406fed87cb9cd3a28b9947e7202a2d14bd (patch) | |
tree | b7717fb053b3307d34706451712072261a6c62d0 /location | |
parent | 83d02a976abfed340bf848f0508a8118939d5008 (diff) |
Rename featureId -> attributionTag
In the core functionality this changes everything including aidl's and
field names:
- Context
- ContentProvider
- AppOps*
- Package parsing
For the rest, this is a shallow change to only change to the changed
APIs. This keeps the change small-ish
Exempt-From-Owner-Approval: Rename
Fixes: 148792795
Test: TH
Change-Id: I2a2245fe76e09e62cb13d5785d2efb4a304ba54a
Merged-In: I2a2245fe76e09e62cb13d5785d2efb4a304ba54a
Diffstat (limited to 'location')
-rw-r--r-- | location/java/android/location/LocationManager.java | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/location/java/android/location/LocationManager.java b/location/java/android/location/LocationManager.java index 550e41f28f85..ff7049ee565b 100644 --- a/location/java/android/location/LocationManager.java +++ b/location/java/android/location/LocationManager.java @@ -612,7 +612,7 @@ public class LocationManager { public Location getLastLocation() { try { return mService.getLastLocation(null, mContext.getPackageName(), - mContext.getFeatureId()); + mContext.getAttributionTag()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -645,7 +645,7 @@ public class LocationManager { try { return mService.getLastLocation(request, mContext.getPackageName(), - mContext.getFeatureId()); + mContext.getAttributionTag()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -742,7 +742,7 @@ public class LocationManager { try { if (mService.getCurrentLocation(currentLocationRequest, remoteCancellationSignal, - listenerTransport, mContext.getPackageName(), mContext.getFeatureId(), + listenerTransport, mContext.getPackageName(), mContext.getAttributionTag(), getListenerIdentifier(consumer))) { listenerTransport.register(mContext.getSystemService(AlarmManager.class), remoteCancellationSignal); @@ -1189,7 +1189,7 @@ public class LocationManager { boolean registered = false; try { mService.requestLocationUpdates(locationRequest, transport, null, - mContext.getPackageName(), mContext.getFeatureId(), + mContext.getPackageName(), mContext.getAttributionTag(), getListenerIdentifier(listener)); registered = true; } catch (RemoteException e) { @@ -1235,7 +1235,7 @@ public class LocationManager { try { mService.requestLocationUpdates(locationRequest, null, pendingIntent, - mContext.getPackageName(), mContext.getFeatureId(), + mContext.getPackageName(), mContext.getAttributionTag(), getListenerIdentifier(pendingIntent)); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); @@ -1711,7 +1711,7 @@ public class LocationManager { LocationRequest request = new LocationRequest().setExpireIn(expiration); try { mService.requestGeofence(request, fence, intent, mContext.getPackageName(), - mContext.getFeatureId(), getListenerIdentifier(intent)); + mContext.getAttributionTag(), getListenerIdentifier(intent)); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -1798,7 +1798,7 @@ public class LocationManager { try { mService.requestGeofence(request, fence, intent, mContext.getPackageName(), - mContext.getFeatureId(), getListenerIdentifier(intent)); + mContext.getAttributionTag(), getListenerIdentifier(intent)); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -2946,7 +2946,7 @@ public class LocationManager { GnssStatusListener transport = new GnssStatusListener(); if (mService.registerGnssStatusCallback(transport, mContext.getPackageName(), - mContext.getFeatureId())) { + mContext.getAttributionTag())) { mListenerTransport = transport; return true; } else { @@ -3012,7 +3012,7 @@ public class LocationManager { GnssMeasurementsListener transport = new GnssMeasurementsListener(); if (mService.addGnssMeasurementsListener(request, transport, mContext.getPackageName(), - mContext.getFeatureId(), "gnss measurement callback")) { + mContext.getAttributionTag(), "gnss measurement callback")) { mListenerTransport = transport; return true; } else { @@ -3065,7 +3065,7 @@ public class LocationManager { GnssNavigationMessageListener transport = new GnssNavigationMessageListener(); if (mService.addGnssNavigationMessageListener(transport, mContext.getPackageName(), - mContext.getFeatureId(), "gnss navigation callback")) { + mContext.getAttributionTag(), "gnss navigation callback")) { mListenerTransport = transport; return true; } else { @@ -3106,7 +3106,7 @@ public class LocationManager { GnssAntennaInfoListener transport = new GnssAntennaInfoListener(); if (mService.addGnssAntennaInfoListener(transport, mContext.getPackageName(), - mContext.getFeatureId(), "gnss antenna info callback")) { + mContext.getAttributionTag(), "gnss antenna info callback")) { mListenerTransport = transport; return true; } else { @@ -3143,7 +3143,7 @@ public class LocationManager { BatchedLocationCallback transport = new BatchedLocationCallback(); if (mService.addGnssBatchingCallback(transport, mContext.getPackageName(), - mContext.getFeatureId(), "batched location callback")) { + mContext.getAttributionTag(), "batched location callback")) { mListenerTransport = transport; return true; } else { |