commit f854174ee6bff124a2238d802137a376c8f328ca
author Steven Ng <stevenckng@google.com> Tue Feb 09 17:32:00 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 09 17:32:01 2016 +0000
tree aa5ef9f555afd89e2cb72410fe9d22d6f80380aa
parent b1540f139d6924555a4c333d10b34ccbccf87331
parent 76bcfb2e6688f1726f12c1ed3043665fc4409144

Merge "Whitelist camera permission for SetupWizard" into nyc-dev

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