Do not allow privacy guard for core system apps.

Hide any applications that have the system UID as well as System UI from
privacy guard. Enabling this on these core apps can have disastrous
consequences, since many privacy guard authorization requests will queue
up. This can cause the system process or System UI to be killed when
they ANR while they wait at the end of a very long queue for the user to authorize them.

By using privacy guard, you are trusting that the system will control
and protect these permissions in the first place; there is no need to protect
the system from itself.

Change-Id: I478d6a6783a4c06fa7ad01a96c413290b232636c

1 files changed, 15 insertions, 1 deletions

diff --git a/src/com/android/settings/privacyguard/AppInfoLoader.java b/src/com/android/settings/privacyguard/AppInfoLoader.java
index 8e3ea5f..6efd7a5 100644
--- a/src/com/android/settings/privacyguard/AppInfoLoader.java
+++ b/src/com/android/settings/privacyguard/AppInfoLoader.java
@@ -36,6 +36,9 @@ import java.util.List;
     private PackageManager mPm;
     private boolean mShowSystemApps;
     private AppOpsManager mAppOps;
+    private static final String[] BLACKLISTED_PACKAGES = {
+            "com.android.systemui"
+    };
 
     public AppInfoLoader(Context context, boolean showSystemApps) {
         super(context);
@@ -64,6 +67,15 @@ import java.util.List;
         cancelLoad();
     }
 
+    private boolean isBlacklisted(String packageName) {
+        for (String pkg : BLACKLISTED_PACKAGES)  {
+            if (pkg.equals(packageName)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     /**
     * Uses the package manager to query for all currently installed apps
     * for the list.
@@ -79,7 +91,9 @@ import java.util.List;
             final ApplicationInfo appInfo = info.applicationInfo;
 
             // skip all system apps if they shall not be included
-            if (!mShowSystemApps && (appInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
+            if ((!mShowSystemApps && (appInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0)
+                    || (appInfo.uid == android.os.Process.SYSTEM_UID)
+                    || isBlacklisted(appInfo.packageName)) {
                 continue;
             }