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

Commit 0dad6280 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "Ignore mkdirs requests while storage is locked." into pi-dev am: c98ee8b9 

am: a1dfff1d

Change-Id: I767ab298e9dc1aa739e8916f5b5acacd08abf131
parents 82eca0fb a1dfff1d

services/core/java/com/android/server/StorageManagerService.java

+3 −0
Original line number Diff line number Diff line
@@ -2668,6 +2668,9 @@ class StorageManagerService extends IStorageManager.Stub 
        final int userId = UserHandle.getUserId(Binder.getCallingUid());

        final UserEnvironment userEnv = new UserEnvironment(userId);



        // Ignore requests to create directories while storage is locked

        if (!isUserKeyUnlocked(userId)) return;



        // Validate that reported package name belongs to caller

        final AppOpsManager appOps = (AppOpsManager) mContext.getSystemService(

                Context.APP_OPS_SERVICE);