Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Ignore mkdirs requests if CE storage not available." into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-04-18 23:37:38 +00:00
committed by Android (Google) Code Review
parent 069c5b58b0 ac094513e0
commit 29f6a3fefd
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/StorageManagerService.java
View File

@@ -2667,9 +2667,17 @@ class StorageManagerService extends IStorageManager.Stub
public void mkdirs(String callingPkg, String appPath) { public void mkdirs(String callingPkg, String appPath) {
final int userId = UserHandle.getUserId(Binder.getCallingUid()); final int userId = UserHandle.getUserId(Binder.getCallingUid());
final UserEnvironment userEnv = new UserEnvironment(userId); final UserEnvironment userEnv = new UserEnvironment(userId);
final String propertyName = "sys.user." + userId + ".ce_available";
// Ignore requests to create directories while storage is locked // Ignore requests to create directories while storage is locked
if (!isUserKeyUnlocked(userId)) return; if (!isUserKeyUnlocked(userId)) {
throw new IllegalStateException("Failed to prepare " + appPath);
}
// Ignore requests to create directories if CE storage is not available
if (!SystemProperties.getBoolean(propertyName, false)) {
throw new IllegalStateException("Failed to prepare " + appPath);
}
// Validate that reported package name belongs to caller // Validate that reported package name belongs to caller
final AppOpsManager appOps = (AppOpsManager) mContext.getSystemService( final AppOpsManager appOps = (AppOpsManager) mContext.getSystemService(