summaryrefslogtreecommitdiff
path: root/location/java
diff options
context:
space:
mode:
author Philip P. Moltmann <moltmann@google.com> 2020-03-05 15:01:29 -0800
committer Philip P. Moltmann <moltmann@google.com> 2020-03-11 23:52:32 +0000
commit8a06c2870e098efcdb24c8bcfb3b5c819ad3fcb0 (patch)
tree3260827b205512d8ea8cce78ee4dca2b057b0966 /location/java
parent7e22a40a614da198f24bfadf4f9549bc5b9ecb8b (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
Diffstat (limited to 'location/java')
-rw-r--r--location/java/android/location/LocationManager.java24
1 files changed, 12 insertions, 12 deletions
diff --git a/location/java/android/location/LocationManager.java b/location/java/android/location/LocationManager.java
index bd721d569c10..c8a6a1a8c865 100644
--- a/location/java/android/location/LocationManager.java
+++ b/location/java/android/location/LocationManager.java
@@ -606,7 +606,7 @@ public class LocationManager {
public Location getLastLocation() {
try {
return mService.getLastLocation(null, mContext.getPackageName(),
- mContext.getFeatureId());
+ mContext.getAttributionTag());
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
@@ -639,7 +639,7 @@ public class LocationManager {
try {
return mService.getLastLocation(request, mContext.getPackageName(),
- mContext.getFeatureId());
+ mContext.getAttributionTag());
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
@@ -723,7 +723,7 @@ public class LocationManager {
try {
if (mService.getCurrentLocation(currentLocationRequest, remoteCancellationSignal,
- listenerTransport, mContext.getPackageName(), mContext.getFeatureId())) {
+ listenerTransport, mContext.getPackageName(), mContext.getAttributionTag())) {
listenerTransport.register(mContext.getSystemService(AlarmManager.class),
remoteCancellationSignal);
if (cancellationSignal != null) {
@@ -1169,7 +1169,7 @@ public class LocationManager {
boolean registered = false;
try {
mService.requestLocationUpdates(locationRequest, transport, null,
- mContext.getPackageName(), mContext.getFeatureId());
+ mContext.getPackageName(), mContext.getAttributionTag());
registered = true;
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
@@ -1214,7 +1214,7 @@ public class LocationManager {
try {
mService.requestLocationUpdates(locationRequest, null, pendingIntent,
- mContext.getPackageName(), mContext.getFeatureId());
+ mContext.getPackageName(), mContext.getAttributionTag());
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
@@ -1714,7 +1714,7 @@ public class LocationManager {
LocationRequest request = new LocationRequest().setExpireIn(expiration);
try {
mService.requestGeofence(request, fence, intent, mContext.getPackageName(),
- mContext.getFeatureId());
+ mContext.getAttributionTag());
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
@@ -1801,7 +1801,7 @@ public class LocationManager {
try {
mService.requestGeofence(request, fence, intent, mContext.getPackageName(),
- mContext.getFeatureId());
+ mContext.getAttributionTag());
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
@@ -2883,7 +2883,7 @@ public class LocationManager {
GnssStatusListener transport = new GnssStatusListener();
try {
mService.registerGnssStatusCallback(transport, mContext.getPackageName(),
- mContext.getFeatureId());
+ mContext.getAttributionTag());
mListenerTransport = transport;
return true;
} catch (RemoteException e) {
@@ -2961,7 +2961,7 @@ public class LocationManager {
GnssMeasurementsListener transport = new GnssMeasurementsListener();
try {
mService.addGnssMeasurementsListener(request, transport, mContext.getPackageName(),
- mContext.getFeatureId());
+ mContext.getAttributionTag());
mListenerTransport = transport;
return true;
} catch (RemoteException e) {
@@ -3027,7 +3027,7 @@ public class LocationManager {
GnssNavigationMessageListener transport = new GnssNavigationMessageListener();
try {
mService.addGnssNavigationMessageListener(transport, mContext.getPackageName(),
- mContext.getFeatureId());
+ mContext.getAttributionTag());
mListenerTransport = transport;
return true;
} catch (RemoteException e) {
@@ -3080,7 +3080,7 @@ public class LocationManager {
GnssAntennaInfoListener transport = new GnssAntennaInfoListener();
try {
mService.addGnssAntennaInfoListener(transport, mContext.getPackageName(),
- mContext.getFeatureId());
+ mContext.getAttributionTag());
mListenerTransport = transport;
return true;
} catch (RemoteException e) {
@@ -3129,7 +3129,7 @@ public class LocationManager {
BatchedLocationCallback transport = new BatchedLocationCallback();
try {
mService.addGnssBatchingCallback(transport, mContext.getPackageName(),
- mContext.getFeatureId());
+ mContext.getAttributionTag());
mListenerTransport = transport;
return true;
} catch (RemoteException e) {