luma/rico_gapps_patch: Changed default permissions.
Changed default permissions for the Google Setup Wizard in the
gapps patch. The previously specified READ_PHONE_STATE permission is
already a part of the broader PHONE_PERMISSIONS.
Change-Id: If408aa22b6e473cab69928a3230f0fa5d552e4dd
diff --git a/gapps_aosp_patch/patch.diff b/gapps_aosp_patch/patch.diff
index daf0e52..fe7ceed 100644
--- a/gapps_aosp_patch/patch.diff
+++ b/gapps_aosp_patch/patch.diff
@@ -1,5 +1,5 @@
diff --git a/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java b/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java
-index 8abc8fc..a33a7de 100644
+index 8abc8fc..ef03c72 100644
--- a/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java
+++ b/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java
@@ -1,5 +1,6 @@
@@ -9,7 +9,7 @@
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
-@@ -591,6 +592,92 @@ final class DefaultPermissionGrantPolicy {
+@@ -591,6 +592,91 @@ final class DefaultPermissionGrantPolicy {
}
}
@@ -86,7 +86,6 @@
+ if (setupwizardPackage != null) {
+ grantRuntimePermissionsLPw(setupwizardPackage, CONTACTS_PERMISSIONS, userId);
+ grantRuntimePermissionsLPw(setupwizardPackage, PHONE_PERMISSIONS, userId);
-+ grantRuntimePermissionsLPw(setupwizardPackage, READ_PHONE_STATE, userId);
+ }
+
+ // Google Play Store
@@ -102,7 +101,7 @@
mService.mSettings.onDefaultRuntimePermissionsGrantedLPr(userId);
}
}
-@@ -614,7 +701,9 @@ final class DefaultPermissionGrantPolicy {
+@@ -614,7 +700,9 @@ final class DefaultPermissionGrantPolicy {
if (doesPackageSupportRuntimePermissions(smsPackage)) {
grantRuntimePermissionsLPw(smsPackage, PHONE_PERMISSIONS, userId);
grantRuntimePermissionsLPw(smsPackage, CONTACTS_PERMISSIONS, userId);
