diff options
| -rw-r--r-- | location/java/android/location/LocationManager.java | 8 | ||||
| -rw-r--r-- | media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaInserterTest.java | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/location/java/android/location/LocationManager.java b/location/java/android/location/LocationManager.java index 32015b87f487..9b81c09f5c5b 100644 --- a/location/java/android/location/LocationManager.java +++ b/location/java/android/location/LocationManager.java @@ -2103,7 +2103,7 @@ public class LocationManager { try { mService.addTestProvider(provider, properties, new ArrayList<>(extraAttributionTags), - mContext.getOpPackageName(), mContext.getFeatureId()); + mContext.getOpPackageName(), mContext.getAttributionTag()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -2125,7 +2125,7 @@ public class LocationManager { try { mService.removeTestProvider(provider, mContext.getOpPackageName(), - mContext.getFeatureId()); + mContext.getAttributionTag()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -2160,7 +2160,7 @@ public class LocationManager { try { mService.setTestProviderLocation(provider, location, mContext.getOpPackageName(), - mContext.getFeatureId()); + mContext.getAttributionTag()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -2190,7 +2190,7 @@ public class LocationManager { try { mService.setTestProviderEnabled(provider, enabled, mContext.getOpPackageName(), - mContext.getFeatureId()); + mContext.getAttributionTag()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaInserterTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaInserterTest.java index a0d449239b2a..ea0494f2a8f1 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaInserterTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaInserterTest.java @@ -89,7 +89,7 @@ public class MediaInserterTest extends InstrumentationTestCase { MockitoAnnotations.initMocks(this); final Context attributionContext = getInstrumentation().getContext() - .createFeatureContext(TEST_FEATURE_ID); + .createAttributionContext(TEST_FEATURE_ID); final ContentProviderClient client = new ContentProviderClient(attributionContext .getContentResolver(), mMockProvider, true); |