diff options
| author | 2016-02-09 17:32:00 +0000 | |
|---|---|---|
| committer | 2016-02-09 17:32:01 +0000 | |
| commit | f854174ee6bff124a2238d802137a376c8f328ca (patch) | |
| tree | aa5ef9f555afd89e2cb72410fe9d22d6f80380aa | |
| parent | b1540f139d6924555a4c333d10b34ccbccf87331 (diff) | |
| parent | 76bcfb2e6688f1726f12c1ed3043665fc4409144 (diff) | |
Merge "Whitelist camera permission for SetupWizard" into nyc-dev
| -rw-r--r-- | services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java b/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java index 6c338c184e4a..9b5fde00bce0 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 @@ final class DefaultPermissionGrantPolicy { grantRuntimePermissionsLPw(setupPackage, PHONE_PERMISSIONS, userId); grantRuntimePermissionsLPw(setupPackage, CONTACTS_PERMISSIONS, userId); grantRuntimePermissionsLPw(setupPackage, LOCATION_PERMISSIONS, userId); + grantRuntimePermissionsLPw(setupPackage, CAMERA_PERMISSIONS, userId); } // Camera |