Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use non-deprecated methods."

Browse Source
This commit is contained in:
TreeHugger Robot
2022-10-10 18:04:04 +00:00
committed by Android (Google) Code Review
parent 7e14f5e744 3bb858b2f4
commit d71dd97d97
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
location/java/android/location/LocationManager.java
View File

@@ -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();
}

2
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaInserterTest.java
View File

@@ -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);