Merge "Add better logic for what is 'system'" into mnc-dev

2 files changed, 10 insertions, 3 deletions

diff --git a/src/com/android/packageinstaller/permission/ui/ManagePermissionsFragment.java b/src/com/android/packageinstaller/permission/ui/ManagePermissionsFragment.java
index 2122ad26..d13453e6 100644
--- a/src/com/android/packageinstaller/permission/ui/ManagePermissionsFragment.java
+++ b/src/com/android/packageinstaller/permission/ui/ManagePermissionsFragment.java
@@ -25,6 +25,7 @@ import android.preference.Preference;
 import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceScreen;
+import android.util.ArraySet;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -47,6 +48,8 @@ public final class ManagePermissionsFragment extends PreferenceFragment
 
     private static final String EXTRA_PREFS_KEY = "extra_prefs_key";
 
+    private ArraySet<String> mLauncherPkgs;
+
     private PermissionGroups mPermissions;
 
     private PreferenceScreen mExtraScreen;
@@ -65,6 +68,7 @@ public final class ManagePermissionsFragment extends PreferenceFragment
         if (ab != null) {
             ab.setDisplayHomeAsUpEnabled(true);
         }
+        mLauncherPkgs = Utils.getLauncherPackages(getContext());
         mPermissions = new PermissionGroups(getActivity(), getLoaderManager(), this);
     }
 
@@ -187,8 +191,8 @@ public final class ManagePermissionsFragment extends PreferenceFragment
                     if (getActivity() == null) {
                         return;
                     }
-                    int granted = permissionApps.getGrantedCount();
-                    int total = permissionApps.getTotalCount();
+                    int granted = permissionApps.getGrantedCount(mLauncherPkgs);
+                    int total = permissionApps.getTotalCount(mLauncherPkgs);
                     finalPref.setSummary(getString(R.string.app_permissions_group_summary,
                             granted, total));
                 }
diff --git a/src/com/android/packageinstaller/permission/ui/PermissionAppsFragment.java b/src/com/android/packageinstaller/permission/ui/PermissionAppsFragment.java
index d0e5452c..f4c271fc 100644
--- a/src/com/android/packageinstaller/permission/ui/PermissionAppsFragment.java
+++ b/src/com/android/packageinstaller/permission/ui/PermissionAppsFragment.java
@@ -30,6 +30,7 @@ import android.preference.PreferenceFragment;
 import android.preference.PreferenceScreen;
 import android.preference.SwitchPreference;
 import android.support.v4.util.ArrayMap;
+import android.util.ArraySet;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -68,6 +69,7 @@ public final class PermissionAppsFragment extends PreferenceFragment implements
     private PermissionApps mPermissionApps;
 
     private ArrayMap<String, AppPermissionGroup> mToggledGroups;
+    private ArraySet<String> mLauncherPkgs;
     private boolean mHasConfirmedRevoke;
 
     private boolean mShowSystem;
@@ -82,6 +84,7 @@ public final class PermissionAppsFragment extends PreferenceFragment implements
         if (ab != null) {
             ab.setDisplayHomeAsUpEnabled(true);
         }
+        mLauncherPkgs = Utils.getLauncherPackages(getContext());
     }
 
     @Override
@@ -189,7 +192,7 @@ public final class PermissionAppsFragment extends PreferenceFragment implements
             }
 
             SwitchPreference pref = (SwitchPreference) findPreference(app.getKey());
-            if (!mShowSystem && app.isSystem()) {
+            if (!mShowSystem && Utils.isSystem(app, mLauncherPkgs)) {
                 if (pref != null) {
                     preferences.removePreference(pref);
                 }