Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55d2b6e8 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

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

parents d99aade6 bbcb3312

core/java/android/content/pm/PackageParser.java

+1 −0
Original line number Diff line number Diff line
@@ -894,6 +894,7 @@ public class PackageParser { 
            }



            pkg.volumeUuid = volumeUuid;

            pkg.applicationInfo.volumeUuid = volumeUuid;

            pkg.baseCodePath = apkPath;

            pkg.mSignatures = null;

services/core/java/com/android/server/pm/PackageManagerService.java

+4 −4
Original line number Diff line number Diff line
@@ -7551,7 +7551,7 @@ 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) ||

        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());