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

Merge "Don't call platformCompat on system apps."

Browse Source
This commit is contained in:
TreeHugger Robot
2019-10-17 17:24:15 +00:00
committed by Android (Google) Code Review
parent 68f6d6f383 685cbc125a
commit a2cfd6c11b
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/java/android/content/pm/AndroidTestBaseUpdater.java
View File

@@ -55,15 +55,20 @@ public class AndroidTestBaseUpdater extends PackageSharedLibraryUpdater {
private static final long REMOVE_ANDROID_TEST_BASE = 133396946L;
private static boolean isChangeEnabled(Package pkg) {
IPlatformCompat platformCompat = IPlatformCompat.Stub.asInterface(
ServiceManager.getService(Context.PLATFORM_COMPAT_SERVICE));
try {
return platformCompat.isChangeEnabled(REMOVE_ANDROID_TEST_BASE, pkg.applicationInfo);
} catch (RemoteException | NullPointerException e) {
Log.e(TAG, "Failed to get a response from PLATFORM_COMPAT_SERVICE", e);
// Do not ask platform compat for system apps to prevent a boot time regression in tests.
// b/142558883.
if (!pkg.applicationInfo.isSystemApp()) {
IPlatformCompat platformCompat = IPlatformCompat.Stub.asInterface(
ServiceManager.getService(Context.PLATFORM_COMPAT_SERVICE));
try {
return platformCompat.isChangeEnabled(REMOVE_ANDROID_TEST_BASE,
pkg.applicationInfo);
} catch (RemoteException | NullPointerException e) {
Log.e(TAG, "Failed to get a response from PLATFORM_COMPAT_SERVICE", e);
}
}
// Fall back to previous behaviour.
return pkg.applicationInfo.targetSdkVersion <= Build.VERSION_CODES.Q;
return pkg.applicationInfo.targetSdkVersion > Build.VERSION_CODES.Q;
}
@Override