diff options
| author | Mathew Inwood <mathewi@google.com> | 2018-02-23 15:01:52 +0000 |
|---|---|---|
| committer | Mathew Inwood <mathewi@google.com> | 2018-03-06 09:54:55 +0000 |
| commit | 6827f4a2c88381fcedb13bc7859b6b753fbf5a00 (patch) | |
| tree | 9812a60d3bfec67ab80e2e0c741bdcc660d0e60a /core/java | |
| parent | 999e97f405b8f01b12a6fb8e844d33dc807813fa (diff) | |
Don't whitelist all system image apps.
Also include in system dump which packages are exempt from the api
restrictions.
This is a cherry-pick of 974290b032b4d98603925d36851422986a5d7d0e
from master.
Test: Verified that the device boots.
Bug: 64382372
Change-Id: Iaeca91478f53c8b4e9608246aab42bdb90f899bb
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/content/pm/ApplicationInfo.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/content/pm/ApplicationInfo.java b/core/java/android/content/pm/ApplicationInfo.java index f7649c9edf01..efa90d308ee0 100644 --- a/core/java/android/content/pm/ApplicationInfo.java +++ b/core/java/android/content/pm/ApplicationInfo.java @@ -1188,6 +1188,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { if (category != CATEGORY_UNDEFINED) { pw.println(prefix + "category=" + category); } + pw.println("isAllowedToUseHiddenApi=" + isAllowedToUseHiddenApi()); } super.dumpBack(pw, prefix); } @@ -1604,8 +1605,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { public boolean isAllowedToUseHiddenApi() { boolean whitelisted = SystemConfig.getInstance().getHiddenApiWhitelistedApps().contains(packageName); - return isSystemApp() || // TODO get rid of this once the whitelist has been populated - (whitelisted && (isSystemApp() || isUpdatedSystemApp())); + return whitelisted && (isSystemApp() || isUpdatedSystemApp()); } /** |