summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2018-03-06 11:50:23 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2018-03-06 11:50:23 +0000
commit3fbc54e6099460ce11daa8ed13462b89e44034f6 (patch)
treebe6890ee9904a3a9fc29c0405eb017a45763a585
parent9bc56108693bc303deba926f73c9ee50aa499e74 (diff)
parent6827f4a2c88381fcedb13bc7859b6b753fbf5a00 (diff)
Merge "Don't whitelist all system image apps." into pi-dev
-rw-r--r--core/java/android/content/pm/ApplicationInfo.java4
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());
}
/**