Merge "Take into account default app for default grants"

am: 82eeb2f20c

* commit '82eeb2f20c934ddc97380032b3c8ecacc21d9a04':
  Take into account default app for default grants

diff --combined services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java
index 7dee499,6fbe8e4..80fd823
--- 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
@@@ -571,26 -571,6 +571,26 @@@ final class DefaultPermissionGrantPolic
                  grantRuntimePermissionsLPw(musicPackage, STORAGE_PERMISSIONS, userId);
              }
  
 +            // Android Wear Home
 +            if (mService.hasSystemFeature(PackageManager.FEATURE_WATCH)) {
 +                Intent homeIntent = new Intent(Intent.ACTION_MAIN);
 +                homeIntent.addCategory(Intent.CATEGORY_HOME_MAIN);
 +
 +                PackageParser.Package wearHomePackage = getDefaultSystemHandlerActivityPackageLPr(
 +                        homeIntent, userId);
 +
 +                if (wearHomePackage != null
 +                        && doesPackageSupportRuntimePermissions(wearHomePackage)) {
 +                    grantRuntimePermissionsLPw(wearHomePackage, CONTACTS_PERMISSIONS, false,
 +                            userId);
 +                    grantRuntimePermissionsLPw(wearHomePackage, PHONE_PERMISSIONS, true, userId);
 +                    grantRuntimePermissionsLPw(wearHomePackage, MICROPHONE_PERMISSIONS, false,
 +                            userId);
 +                    grantRuntimePermissionsLPw(wearHomePackage, LOCATION_PERMISSIONS, false,
 +                            userId);
 +                }
 +            }
 +
              mService.mSettings.onDefaultRuntimePermissionsGrantedLPr(userId);
          }
      }
@@@ -598,17 -578,13 +598,16 @@@
      private void grantDefaultPermissionsToDefaultSystemDialerAppLPr(
              PackageParser.Package dialerPackage, int userId) {
          if (doesPackageSupportRuntimePermissions(dialerPackage)) {
 -            grantRuntimePermissionsLPw(dialerPackage, PHONE_PERMISSIONS, userId);
 +            boolean isPhonePermFixed =
 +                    mService.hasSystemFeature(PackageManager.FEATURE_WATCH);
 +            grantRuntimePermissionsLPw(
 +                    dialerPackage, PHONE_PERMISSIONS, isPhonePermFixed, userId);
              grantRuntimePermissionsLPw(dialerPackage, CONTACTS_PERMISSIONS, userId);
              grantRuntimePermissionsLPw(dialerPackage, SMS_PERMISSIONS, userId);
              grantRuntimePermissionsLPw(dialerPackage, MICROPHONE_PERMISSIONS, userId);
          }
      }
  
- 
      private void grantDefaultPermissionsToDefaultSystemSmsAppLPr(
              PackageParser.Package smsPackage, int userId) {
          if (doesPackageSupportRuntimePermissions(smsPackage)) {
@@@ -618,7 -594,6 +617,6 @@@
          }
      }
  
- 
      public void grantDefaultPermissionsToDefaultSmsAppLPr(String packageName, int userId) {
          Log.i(TAG, "Granting permissions to default sms app for user:" + userId);
          if (packageName == null) {
@@@ -696,29 -671,18 +694,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;
          }
@@@ -744,10 -708,9 +731,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;
              }