commit 76bcfb2e6688f1726f12c1ed3043665fc4409144
author Steven Ng <stevenckng@google.com> Wed Feb 03 11:53:25 2016 +0000
committer Steven Ng <stevenckng@google.com> Mon Feb 08 20:26:04 2016 +0000
tree 8517b511f651f75fa74de8d6e41d52bd4e1b3f6f
parent 95728a5db6595e473acf8f428f238afc2fdbbe80

Whitelist camera permission for SetupWizard

+ Camera permission is required for QR provisioning in SetupWizard.

Bug: 26932941
Change-Id: I1573cdd3b8ac708f457a9c7efbbf02c3c8ce6d8d
(cherry picked from commit 950b2dee6648a90bd2e9fedecde137f41f7c4513)

services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java

diff --git a/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java b/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java
index 6c338c1..9b5fde0 100644
--- a/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java
+++ b/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java
@@ -262,6 +262,7 @@
                 grantRuntimePermissionsLPw(setupPackage, PHONE_PERMISSIONS, userId);
                 grantRuntimePermissionsLPw(setupPackage, CONTACTS_PERMISSIONS, userId);
                 grantRuntimePermissionsLPw(setupPackage, LOCATION_PERMISSIONS, userId);
+                grantRuntimePermissionsLPw(setupPackage, CAMERA_PERMISSIONS, userId);
             }
 
             // Camera