commit c98ee8b96424dc5e0b3dfc375112d171170c6e26
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Mar 27 05:18:47 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 27 05:18:47 2018 +0000
tree e1ad44da7768493cc059fb1c75dc26e5876ce338
parent 992d0785422479dceddc6591736a4b5f3ab65933
parent 196c755fe3350f14bd4b6fed4b9b5019ebe5fe53

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

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

diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java
index 3d7b21d..379658f 100644
--- a/services/core/java/com/android/server/StorageManagerService.java
+++ b/services/core/java/com/android/server/StorageManagerService.java
@@ -2668,6 +2668,9 @@
         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);