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

Merge "Update StorageManagerService.mkdirs to translate sandboxed paths."

Browse Source
This commit is contained in:
Sudheer Shanka
2019-03-01 01:04:16 +00:00
committed by Android (Google) Code Review
parent 279b81849d a63bfb300d
commit cc44edcfff
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2983,7 +2983,9 @@ class StorageManagerService extends IStorageManager.Stub
@Override
public void mkdirs(String callingPkg, String appPath) {
final int userId = UserHandle.getUserId(Binder.getCallingUid());
final int callingPid = Binder.getCallingPid();
final int callingUid = Binder.getCallingUid();
final int userId = UserHandle.getUserId(callingUid);
final UserEnvironment userEnv = new UserEnvironment(userId);
final String propertyName = "sys.user." + userId + ".ce_available";
@@ -3001,7 +3003,7 @@ class StorageManagerService extends IStorageManager.Stub
// Validate that reported package name belongs to caller
final AppOpsManager appOps = (AppOpsManager) mContext.getSystemService(
Context.APP_OPS_SERVICE);
appOps.checkPackage(Binder.getCallingUid(), callingPkg);
appOps.checkPackage(callingUid, callingPkg);
File appFile = null;
try {
@@ -3020,11 +3022,13 @@ class StorageManagerService extends IStorageManager.Stub
appPath = appPath + "/";
}
final String systemPath = translateAppToSystem(appPath, callingPid, callingUid);
try {
mVold.mkdirs(appPath);
mVold.mkdirs(systemPath);
return;
} catch (Exception e) {
throw new IllegalStateException("Failed to prepare " + appPath + ": " + e);
throw new IllegalStateException("Failed to prepare " + systemPath + ": " + e);
}
}