Merge "Use non-deprecated methods." (d71dd97d) · Commits · e / os / android_frameworks_base

location/java/android/location/LocationManager.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -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();
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);