commit dc079229e7a8f37dd220119b63fa12e6d81710c0
author Daichi Hirono <hirono@google.com> Thu Jan 07 03:49:02 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 07 03:49:02 2016 +0000
tree 88fe2f47493d6b0752a46cfadfa22b341d8aa7b4
parent ed95093333618e1b33a528d3fcc0ce2a44ef9cd1
parent 52da3ad906afbfc5bc57328985543ebc5f7cdb44

Merge "Add getPartialObject to Java MtpDevice class."

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 b254f29..6c338c1 100644
--- a/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java
+++ b/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java
@@ -261,6 +261,7 @@
                     && doesPackageSupportRuntimePermissions(setupPackage)) {
                 grantRuntimePermissionsLPw(setupPackage, PHONE_PERMISSIONS, userId);
                 grantRuntimePermissionsLPw(setupPackage, CONTACTS_PERMISSIONS, userId);
+                grantRuntimePermissionsLPw(setupPackage, LOCATION_PERMISSIONS, userId);
             }
 
             // Camera