Merge "Take into account default app for default grants"

diff --combined services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java
index 96bc86c,0432855..6fbe8e4
--- 1/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java
--- 2/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java
+++ b/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java
@@@ -245,8 -245,6 +245,8 @@@ final class DefaultPermissionGrantPolic
              if (verifierPackage != null
                      && doesPackageSupportRuntimePermissions(verifierPackage)) {
                  grantRuntimePermissionsLPw(verifierPackage, STORAGE_PERMISSIONS, true, userId);
 +                grantRuntimePermissionsLPw(verifierPackage, PHONE_PERMISSIONS, false, userId);
 +                grantRuntimePermissionsLPw(verifierPackage, SMS_PERMISSIONS, false, userId);
              }
  
              // SetupWizard
@@@ -585,7 -583,6 +585,6 @@@
          }
      }
  
- 
      private void grantDefaultPermissionsToDefaultSystemSmsAppLPr(
              PackageParser.Package smsPackage, int userId) {
          if (doesPackageSupportRuntimePermissions(smsPackage)) {
@@@ -595,7 -592,6 +594,6 @@@
          }
      }
  
- 
      public void grantDefaultPermissionsToDefaultSmsAppLPr(String packageName, int userId) {
          Log.i(TAG, "Granting permissions to default sms app for user:" + userId);
          if (packageName == null) {
@@@ -673,29 -669,18 +671,18 @@@
  
      private PackageParser.Package getDefaultSystemHandlerActivityPackageLPr(
              Intent intent, int userId) {
-         List<ResolveInfo> handlers = mService.mActivities.queryIntent(intent,
-                 intent.resolveType(mService.mContext.getContentResolver()),
-                 PackageManager.GET_DISABLED_COMPONENTS, userId);
-         if (handlers == null) {
+         ResolveInfo handler = mService.resolveIntent(intent,
+                 intent.resolveType(mService.mContext.getContentResolver()), 0, userId);
+         if (handler == null) {
              return null;
          }
-         final int handlerCount = handlers.size();
-         for (int i = 0; i < handlerCount; i++) {
-             ResolveInfo handler = handlers.get(i);
-             PackageParser.Package handlerPackage = getSystemPackageLPr(
-                     handler.activityInfo.packageName);
-             if (handlerPackage != null) {
-                 return handlerPackage;
-             }
-         }
-         return null;
+         return getSystemPackageLPr(handler.activityInfo.packageName);
      }
  
      private PackageParser.Package getDefaultSystemHandlerServicePackageLPr(
              Intent intent, int userId) {
          List<ResolveInfo> handlers = mService.queryIntentServices(intent,
-                 intent.resolveType(mService.mContext.getContentResolver()),
-                 PackageManager.GET_DISABLED_COMPONENTS, userId);
+                 intent.resolveType(mService.mContext.getContentResolver()), 0, userId);
          if (handlers == null) {
              return null;
          }
@@@ -721,10 -706,9 +708,9 @@@
          for (String syncAdapterPackageName : syncAdapterPackageNames) {
              homeIntent.setPackage(syncAdapterPackageName);
  
-             List<ResolveInfo> homeActivities = mService.mActivities.queryIntent(homeIntent,
-                     homeIntent.resolveType(mService.mContext.getContentResolver()),
-                     PackageManager.GET_DISABLED_COMPONENTS, userId);
-             if (!homeActivities.isEmpty()) {
+             ResolveInfo homeActivity = mService.resolveIntent(homeIntent,
+                     homeIntent.resolveType(mService.mContext.getContentResolver()), 0, userId);
+             if (homeActivity != null) {
                  continue;
              }
  
@@@ -819,8 -803,8 +805,8 @@@
  
                      mService.grantRuntimePermission(pkg.packageName, permission, userId);
                      if (DEBUG) {
 -                        Log.i(TAG, "Granted " + permission + " to default handler "
 -                                + pkg.packageName);
 +                        Log.i(TAG, "Granted " + (systemFixed ? "fixed " : "not fixed ")
 +                                + permission + " to default handler " + pkg.packageName);
                      }
  
                      int newFlags = PackageManager.FLAG_PERMISSION_GRANTED_BY_DEFAULT;
@@@ -831,19 -815,6 +817,19 @@@
                      mService.updatePermissionFlags(permission, pkg.packageName,
                              newFlags, newFlags, userId);
                  }
 +
 +                // If a component gets a permission for being the default handler A
 +                // and also default handler B, we grant the weaker grant form.
 +                if ((flags & PackageManager.FLAG_PERMISSION_GRANTED_BY_DEFAULT) != 0
 +                        && (flags & PackageManager.FLAG_PERMISSION_SYSTEM_FIXED) != 0
 +                        && !systemFixed) {
 +                    if (DEBUG) {
 +                        Log.i(TAG, "Granted not fixed " + permission + " to default handler "
 +                                + pkg.packageName);
 +                    }
 +                    mService.updatePermissionFlags(permission, pkg.packageName,
 +                            PackageManager.FLAG_PERMISSION_SYSTEM_FIXED, 0, userId);
 +                }
              }
          }
      }