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 am: 29f6a3fefd

Browse Source 
am: 719b3d3cfb

Change-Id: Ic68a02d128e5f08b4761bba39ae48ba86ae520fe
This commit is contained in:
Farid Zare Seisan
2018-04-18 16:55:30 -07:00
committed by android-build-merger
parent 27384c4b63 719b3d3cfb
commit aca5a208ac
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) {
final int userId = UserHandle.getUserId(Binder.getCallingUid());
final UserEnvironment userEnv = new UserEnvironment(userId);
final String propertyName = "sys.user." + userId + ".ce_available";
// 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
final AppOpsManager appOps = (AppOpsManager) mContext.getSystemService(