commit | 196c755fe3350f14bd4b6fed4b9b5019ebe5fe53 | [log] [tgz] |
---|---|---|
author | Jeff Sharkey <jsharkey@android.com> | Mon Mar 26 15:56:50 2018 -0600 |
committer | Jeff Sharkey <jsharkey@android.com> | Mon Mar 26 15:56:57 2018 -0600 |
tree | 751ea6c6992cdb6e57b4de0456b63a74a37c2b37 | |
parent | b133cbfd0b5afb0217ee45c8e26847465c6a717a [diff] |
Ignore mkdirs requests while storage is locked. Test: none Bug: 76222913 Change-Id: Ia62479a7d3cfc0b308d1e2b19a775286d512fecf
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);