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

Merge "Correctly derive ABI for apps on adopted media." into mnc-dr-dev

Browse Source 
am: 55d2b6e8e6

* commit '55d2b6e8e6f364e2fd52c45b5fa3eb6a56082456':
  Correctly derive ABI for apps on adopted media.
This commit is contained in:
Jeff Sharkey
2015-10-21 00:55:05 +00:00
committed by android-build-merger
parent d91b1f6bb8 55d2b6e8e6
commit 257d2ca7fd
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/content/pm/PackageParser.java
View File

@@ -894,6 +894,7 @@ public class PackageParser {
}
pkg.volumeUuid = volumeUuid;
pkg.applicationInfo.volumeUuid = volumeUuid;
pkg.baseCodePath = apkPath;
pkg.mSignatures = null;

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

@@ -7551,8 +7551,8 @@ public class PackageManagerService extends IPackageManager.Stub {
// We would never need to extract libs for forward-locked and external packages,
// since the container service will do it for us. We shouldn't attempt to
// extract libs from system app when it was not updated.
if (pkg.isForwardLocked() || isExternal(pkg) ||
(isSystemApp(pkg) && !pkg.isUpdatedSystemApp()) ) {
if (pkg.isForwardLocked() || pkg.applicationInfo.isExternalAsec() ||
(isSystemApp(pkg) && !pkg.isUpdatedSystemApp())) {
extractLibs = false;
}
@@ -7829,7 +7829,7 @@ public class PackageManagerService extends IPackageManager.Stub {
final String codePath = pkg.codePath;
final File codeFile = new File(codePath);
final boolean bundledApp = info.isSystemApp() && !info.isUpdatedSystemApp();
final boolean asecApp = info.isForwardLocked() || isExternal(info);
final boolean asecApp = info.isForwardLocked() || info.isExternalAsec();
info.nativeLibraryRootDir = null;
info.nativeLibraryRootRequiresIsa = false;
@@ -13647,7 +13647,7 @@ public class PackageManagerService extends IPackageManager.Stub {
if (ps != null) {
libDirRoot = ps.legacyNativeLibraryPathString;
}
if (p != null && (isExternal(p) || p.isForwardLocked())) {
if (p != null && (p.isForwardLocked() || p.applicationInfo.isExternalAsec())) {
final long token = Binder.clearCallingIdentity();
try {
String secureContainerId = cidFromCodePath(p.applicationInfo.getBaseCodePath());