commit 6827f4a2c88381fcedb13bc7859b6b753fbf5a00
author Mathew Inwood <mathewi@google.com> Fri Feb 23 15:01:52 2018 +0000
committer Mathew Inwood <mathewi@google.com> Tue Mar 06 09:54:55 2018 +0000
tree 9812a60d3bfec67ab80e2e0c741bdcc660d0e60a
parent 999e97f405b8f01b12a6fb8e844d33dc807813fa

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

core/java/android/content/pm/ApplicationInfo.java

diff --git a/core/java/android/content/pm/ApplicationInfo.java b/core/java/android/content/pm/ApplicationInfo.java
index f7649c9..efa90d3 100644
--- a/core/java/android/content/pm/ApplicationInfo.java
+++ b/core/java/android/content/pm/ApplicationInfo.java
@@ -1188,6 +1188,7 @@
             if (category != CATEGORY_UNDEFINED) {
                 pw.println(prefix + "category=" + category);
             }
+            pw.println("isAllowedToUseHiddenApi=" + isAllowedToUseHiddenApi());
         }
         super.dumpBack(pw, prefix);
     }
@@ -1604,8 +1605,7 @@
     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());
     }
 
     /**