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

Commit cea73218 authored by Selim Gurun's avatar Selim Gurun Committed by Android (Google) Code Review
Browse files

Merge "Corrections to processing abioverride flag" into nyc-dev

parents c0a8fa89 5c8acb43

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

+1 −1
Original line number Diff line number Diff line
@@ -8605,7 +8605,7 @@ public class PackageManagerService extends IPackageManager.Stub { 
                if (abi32 >= 0) {

                    final String abi = Build.SUPPORTED_32_BIT_ABIS[abi32];

                    if (abi64 >= 0) {

                        if (cpuAbiOverride == null && pkg.use32bitAbi) {

                        if (pkg.use32bitAbi) {

                            pkg.applicationInfo.secondaryCpuAbi = pkg.applicationInfo.primaryCpuAbi;

                            pkg.applicationInfo.primaryCpuAbi = abi;

                        } else {

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

+3 −3
Original line number Diff line number Diff line
@@ -578,7 +578,7 @@ final class Settings { 
        }

        PackageSetting ret = addPackageLPw(name, p.realName, p.codePath, p.resourcePath,

                p.legacyNativeLibraryPathString, p.primaryCpuAbiString,

                p.secondaryCpuAbiString, p.secondaryCpuAbiString,

                p.secondaryCpuAbiString, p.cpuAbiOverrideString,

                p.appId, p.versionCode, p.pkgFlags, p.pkgPrivateFlags,

                p.parentPackageName, p.childPackageNames);

        mDisabledSysPackages.remove(name);