Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/packages/apps/PackageInstaller into cm-13.0staging/cm-13.0+r22

Android 6.0.1 release 22

2 files changed, 16 insertions, 22 deletions

diff --git a/src/com/android/packageinstaller/permission/utils/LocationUtils.java b/src/com/android/packageinstaller/permission/utils/LocationUtils.java
index 512fcf44..0296ae80 100644
--- a/src/com/android/packageinstaller/permission/utils/LocationUtils.java
+++ b/src/com/android/packageinstaller/permission/utils/LocationUtils.java
@@ -36,23 +36,9 @@ public class LocationUtils {
 
     public static final String LOCATION_PERMISSION = Manifest.permission_group.LOCATION;
 
-    public static ArrayList<String> getLocationProviders() {
-        ArrayList<String> providers = new ArrayList<>();
-        Resources res = Resources.getSystem();
-        providers.add(res.getString(
-                com.android.internal.R.string.config_networkLocationProviderPackageName));
-
-        for (String provider :
-            res.getStringArray(com.android.internal.R.array.config_locationProviderPackageNames)) {
-            providers.add(provider);
-        }
-
-        return providers;
-    }
-
     public static void showLocationDialog(final Context context, CharSequence label) {
         new AlertDialog.Builder(context)
-                .setIcon(com.android.internal.R.drawable.ic_dialog_alert_material)
+                .setIcon(R.drawable.ic_dialog_alert_material)
                 .setTitle(android.R.string.dialog_alert_title)
                 .setMessage(context.getString(R.string.location_warning, label))
                 .setNegativeButton(R.string.ok, null)
@@ -83,5 +69,4 @@ public class LocationUtils {
             return false;
         }
     }
-
 }
diff --git a/src/com/android/packageinstaller/permission/utils/Utils.java b/src/com/android/packageinstaller/permission/utils/Utils.java
index 2940a729..21830378 100644
--- a/src/com/android/packageinstaller/permission/utils/Utils.java
+++ b/src/com/android/packageinstaller/permission/utils/Utils.java
@@ -31,8 +31,11 @@ import android.util.Log;
 import android.util.TypedValue;
 
 import com.android.packageinstaller.permission.model.AppPermissionGroup;
+import com.android.packageinstaller.permission.model.AppPermissions;
 import com.android.packageinstaller.permission.model.PermissionApps.PermissionApp;
 
+import java.util.List;
+
 public class Utils {
 
     private static final String LOG_TAG = "Utils";
@@ -127,14 +130,20 @@ public class Utils {
         return launcherPkgs;
     }
 
+    public static List<ApplicationInfo> getAllInstalledApplications(Context context) {
+        return context.getPackageManager().getInstalledApplications(0);
+    }
+
     public static boolean isSystem(PermissionApp app, ArraySet<String> launcherPkgs) {
-        ApplicationInfo info = app.getAppInfo();
-        return info.isSystemApp() && (info.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) == 0
-                && !launcherPkgs.contains(info.packageName);
+        return isSystem(app.getAppInfo(), launcherPkgs);
     }
 
-    public static boolean isTelevision(Context context) {
-        int uiMode = context.getResources().getConfiguration().uiMode;
-        return (uiMode & Configuration.UI_MODE_TYPE_MASK) == Configuration.UI_MODE_TYPE_TELEVISION;
+    public static boolean isSystem(AppPermissions app, ArraySet<String> launcherPkgs) {
+        return isSystem(app.getPackageInfo().applicationInfo, launcherPkgs);
+    }
+
+    public static boolean isSystem(ApplicationInfo info, ArraySet<String> launcherPkgs) {
+        return info.isSystemApp() && (info.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) == 0
+                && !launcherPkgs.contains(info.packageName);
     }
 }