commit a04325a70848b2e66b9ad95ac394b555c69f39c1
author Hai Zhang <zhanghai@google.com> Sat Jan 11 00:51:27 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Jan 11 00:51:27 2020 +0000
tree 93488c5da95f1c5f18c33c74e850b341a2c4d2f0
parent 811e352d3da79854d9755f9ab0fe58e21fb503f5
parent 9323682f96e908f5969ea911d560322e8b670451

Merge "Don't hold package manager lock when granting default permissions."

services/core/java/com/android/server/pm/permission/PermissionManagerService.java

diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
index d8c1966..d468cd9 100644
--- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
+++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
@@ -4571,8 +4571,8 @@
 
         @Override
         public void onNewUserCreated(int userId) {
+            mDefaultPermissionGrantPolicy.grantDefaultPermissions(userId);
             synchronized (mLock) {
-                mDefaultPermissionGrantPolicy.grantDefaultPermissions(userId);
                 // NOTE: This adds UPDATE_PERMISSIONS_REPLACE_PKG
                 PermissionManagerService.this.updateAllPermissions(
                         StorageManager.UUID_PRIVATE_INTERNAL, true, mDefaultPermissionCallback);