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

2018-03-27 05:18:47 +00:00
parent 992d078542 196c755fe3
commit c98ee8b964
1 changed files with 3 additions and 0 deletions
--- a/services/core/java/com/android/server/StorageManagerService.java
+++ b/services/core/java/com/android/server/StorageManagerService.java
@@ -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);