Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf6da88f authored by Hai Zhang's avatar Hai Zhang Committed by Android (Google) Code Review
Browse files

Merge "Remove unnecessary locking that causes deadlock."

parents 2451ee45 ad65ba4d

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

+4 −6
Original line number Diff line number Diff line
@@ -4463,12 +4463,10 @@ public class PermissionManagerService extends IPermissionManager.Stub { 


        final PermissionPolicyInternal permissionPolicyInternal = LocalServices.getService(

                PermissionPolicyInternal.class);

        permissionPolicyInternal.setOnInitializedCallback(userId -> {

        permissionPolicyInternal.setOnInitializedCallback(userId ->

                // The SDK updated case is already handled when we run during the ctor.

            synchronized (mLock) {

                updateAllPermissions(StorageManager.UUID_PRIVATE_INTERNAL, false);

            }

        });

                updateAllPermissions(StorageManager.UUID_PRIVATE_INTERNAL, false)

        );



        mSystemReady = true;