OSDN Git Service

Whitelist camera permission for SetupWizard
authorSteven Ng <stevenckng@google.com>
Wed, 3 Feb 2016 11:53:25 +0000 (11:53 +0000)
committerSteven Ng <stevenckng@google.com>
Mon, 8 Feb 2016 20:26:04 +0000 (20:26 +0000)
+ 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

index 6c338c1..9b5fde0 100644 (file)
@@ -262,6 +262,7 @@ final class DefaultPermissionGrantPolicy {
                 grantRuntimePermissionsLPw(setupPackage, PHONE_PERMISSIONS, userId);
                 grantRuntimePermissionsLPw(setupPackage, CONTACTS_PERMISSIONS, userId);
                 grantRuntimePermissionsLPw(setupPackage, LOCATION_PERMISSIONS, userId);
+                grantRuntimePermissionsLPw(setupPackage, CAMERA_PERMISSIONS, userId);
             }
 
             // Camera