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

Commit a1dfff1d 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

Change-Id: I38c9b948a00c43c349ea3a12c61f4b307bdf4329
parents 85584bcb c98ee8b9

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);