drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Give shell permission to move apps." into mnc-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2015-08-28 19:30:31 +00:00
committed by Android (Google) Code Review
parent 3ab2e66424 e515c6495d
commit d88152b4d9
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/Shell/AndroidManifest.xml
View File

@ -65,6 +65,7 @@
<uses-permission android:name="android.permission.READ_INPUT_STATE" /> <uses-permission android:name="android.permission.READ_INPUT_STATE" />
<uses-permission android:name="android.permission.SET_ORIENTATION" /> <uses-permission android:name="android.permission.SET_ORIENTATION" />
<uses-permission android:name="android.permission.INSTALL_PACKAGES" /> <uses-permission android:name="android.permission.INSTALL_PACKAGES" />
<uses-permission android:name="android.permission.MOVE_PACKAGE" />
<uses-permission android:name="android.permission.CLEAR_APP_USER_DATA" /> <uses-permission android:name="android.permission.CLEAR_APP_USER_DATA" />
<uses-permission android:name="android.permission.DELETE_CACHE_FILES" /> <uses-permission android:name="android.permission.DELETE_CACHE_FILES" />
<uses-permission android:name="android.permission.DELETE_PACKAGES" /> <uses-permission android:name="android.permission.DELETE_PACKAGES" />

11
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@ -13600,9 +13600,14 @@ public class PackageManagerService extends IPackageManager.Stub {
libDirRoot = ps.legacyNativeLibraryPathString; libDirRoot = ps.legacyNativeLibraryPathString;
} }
if (p != null && (isExternal(p) || p.isForwardLocked())) { if (p != null && (isExternal(p) || p.isForwardLocked())) {
String secureContainerId = cidFromCodePath(p.applicationInfo.getBaseCodePath()); final long token = Binder.clearCallingIdentity();
if (secureContainerId != null) { try {
asecPath = PackageHelper.getSdFilesystem(secureContainerId); String secureContainerId = cidFromCodePath(p.applicationInfo.getBaseCodePath());
if (secureContainerId != null) {
asecPath = PackageHelper.getSdFilesystem(secureContainerId);
}
} finally {
Binder.restoreCallingIdentity(token);
} }
} }
} }