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

Commit 2d275051 authored by Songchun Fan's avatar Songchun Fan
Browse files

[pm] remove redundant boolean flags in PackageSetting 

DEFAULT_TO_DEVICE_PROTECTED_STORAGE and PERSISTENT are already in the
pkgFlags and pkgPrivateFlags. No need to store them separately.

BUG: 300705469
Test: builds

Change-Id: I4da7f462ef368b2530f80fad15b5afb75f5c7398
parent a8c34f8d

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

+0 −4
Original line number Original line Diff line number Diff line
@@ -24,7 +24,6 @@ import static android.content.ContentProvider.isAuthorityRedirectedForCloneProfi 
import static android.content.Intent.ACTION_MAIN;

import static android.content.Intent.ACTION_MAIN;

import static android.content.Intent.CATEGORY_DEFAULT;

import static android.content.Intent.CATEGORY_DEFAULT;

import static android.content.Intent.CATEGORY_HOME;

import static android.content.Intent.CATEGORY_HOME;

import static android.content.pm.ApplicationInfo.PRIVATE_FLAG_DEFAULT_TO_DEVICE_PROTECTED_STORAGE;

import static android.content.pm.PackageManager.CERT_INPUT_RAW_X509;

import static android.content.pm.PackageManager.CERT_INPUT_RAW_X509;

import static android.content.pm.PackageManager.CERT_INPUT_SHA256;

import static android.content.pm.PackageManager.CERT_INPUT_SHA256;

import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DEFAULT;

import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DEFAULT;
@@ -1525,9 +1524,6 @@ public class ComputerEngine implements Computer { 
            ai.secondaryCpuAbi = ps.getSecondaryCpuAbiLegacy();

            ai.secondaryCpuAbi = ps.getSecondaryCpuAbiLegacy();

            ai.volumeUuid = ps.getVolumeUuid();

            ai.volumeUuid = ps.getVolumeUuid();

            ai.storageUuid = StorageManager.convert(ai.volumeUuid);

            ai.storageUuid = StorageManager.convert(ai.volumeUuid);

            if (ps.isDefaultToDeviceProtectedStorage()) {

                ai.privateFlags |= PRIVATE_FLAG_DEFAULT_TO_DEVICE_PROTECTED_STORAGE;

            }

            ai.setVersionCode(ps.getVersionCode());

            ai.setVersionCode(ps.getVersionCode());

            ai.flags = ps.getFlags();

            ai.flags = ps.getFlags();

            ai.privateFlags = ps.getPrivateFlags();

            ai.privateFlags = ps.getPrivateFlags();

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

+4 −3
Original line number Original line Diff line number Diff line
@@ -1632,7 +1632,8 @@ final class InstallPackageHelper { 
                synchronized (mPm.mLock) {

                synchronized (mPm.mLock) {

                    if (DEBUG_INSTALL) {

                    if (DEBUG_INSTALL) {

                        Slog.d(TAG,

                        Slog.d(TAG,

                                "replacePackageLI: new=" + parsedPackage + ", old=" + oldPackage);

                                "replacePackageLI: new=" + parsedPackage

                                        + ", old=" + oldPackageState.getName());

                    }

                    }





                    ps = mPm.mSettings.getPackageLPr(pkgName11);

                    ps = mPm.mSettings.getPackageLPr(pkgName11);
@@ -1791,7 +1792,7 @@ final class InstallPackageHelper { 




                    if (DEBUG_INSTALL) {

                    if (DEBUG_INSTALL) {

                        Slog.d(TAG, "replaceSystemPackageLI: new=" + parsedPackage

                        Slog.d(TAG, "replaceSystemPackageLI: new=" + parsedPackage

                                + ", old=" + oldPackage);

                                + ", old=" + oldPackageState.getName());

                    }

                    }

                    request.setReturnCode(PackageManager.INSTALL_SUCCEEDED);

                    request.setReturnCode(PackageManager.INSTALL_SUCCEEDED);

                    request.setApexModuleName(oldPackageState.getApexModuleName());

                    request.setApexModuleName(oldPackageState.getApexModuleName());
@@ -1801,7 +1802,7 @@ final class InstallPackageHelper { 
                    if (DEBUG_INSTALL) {

                    if (DEBUG_INSTALL) {

                        Slog.d(TAG,

                        Slog.d(TAG,

                                "replaceNonSystemPackageLI: new=" + parsedPackage + ", old="

                                "replaceNonSystemPackageLI: new=" + parsedPackage + ", old="

                                        + oldPackage);

                                        + oldPackageState.getName());

                    }

                    }

                }

                }

            } else { // new package install

            } else { // new package install

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

+7 −22

File changed.

Preview size limit exceeded, changes collapsed.

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

+2 −4
Original line number Original line Diff line number Diff line
@@ -220,7 +220,7 @@ final class ScanPackageUtils { 
                    UserManagerService.getInstance(), usesSdkLibraries,

                    UserManagerService.getInstance(), usesSdkLibraries,

                    parsedPackage.getUsesSdkLibrariesVersionsMajor(), usesStaticLibraries,

                    parsedPackage.getUsesSdkLibrariesVersionsMajor(), usesStaticLibraries,

                    parsedPackage.getUsesStaticLibrariesVersions(), parsedPackage.getMimeGroups(),

                    parsedPackage.getUsesStaticLibrariesVersions(), parsedPackage.getMimeGroups(),

                    newDomainSetId, parsedPackage.isPersistent(),

                    newDomainSetId,

                    parsedPackage.getTargetSdkVersion(), parsedPackage.getRestrictUpdateHash());

                    parsedPackage.getTargetSdkVersion(), parsedPackage.getRestrictUpdateHash());

        } else {

        } else {

            // make a deep copy to avoid modifying any existing system state.

            // make a deep copy to avoid modifying any existing system state.
@@ -241,7 +241,7 @@ final class ScanPackageUtils { 
                    UserManagerService.getInstance(),

                    UserManagerService.getInstance(),

                    usesSdkLibraries, parsedPackage.getUsesSdkLibrariesVersionsMajor(),

                    usesSdkLibraries, parsedPackage.getUsesSdkLibrariesVersionsMajor(),

                    usesStaticLibraries, parsedPackage.getUsesStaticLibrariesVersions(),

                    usesStaticLibraries, parsedPackage.getUsesStaticLibrariesVersions(),

                    parsedPackage.getMimeGroups(), newDomainSetId, parsedPackage.isPersistent(),

                    parsedPackage.getMimeGroups(), newDomainSetId,

                    parsedPackage.getTargetSdkVersion(), parsedPackage.getRestrictUpdateHash());

                    parsedPackage.getTargetSdkVersion(), parsedPackage.getRestrictUpdateHash());

        }

        }
@@ -464,8 +464,6 @@ final class ScanPackageUtils { 
                            + " to " + volumeUuid);

                            + " to " + volumeUuid);

            pkgSetting.setVolumeUuid(volumeUuid);

            pkgSetting.setVolumeUuid(volumeUuid);

        }

        }

        pkgSetting.setDefaultToDeviceProtectedStorage(

                parsedPackage.isDefaultToDeviceProtectedStorage());





        SharedLibraryInfo sdkLibraryInfo = null;

        SharedLibraryInfo sdkLibraryInfo = null;

        if (!TextUtils.isEmpty(parsedPackage.getSdkLibraryName())) {

        if (!TextUtils.isEmpty(parsedPackage.getSdkLibraryName())) {

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

+2 −19
Original line number Original line Diff line number Diff line
@@ -946,7 +946,6 @@ public final class Settings implements Watchable, Snappable, ResilientAtomicFile 
            ret.setMimeGroups(p.getMimeGroups());

            ret.setMimeGroups(p.getMimeGroups());

            ret.setAppMetadataFilePath(p.getAppMetadataFilePath());

            ret.setAppMetadataFilePath(p.getAppMetadataFilePath());

            ret.getPkgState().setUpdatedSystemApp(false);

            ret.getPkgState().setUpdatedSystemApp(false);

            ret.setIsPersistent(p.isPersistent());

            ret.setTargetSdkVersion(p.getTargetSdkVersion());

            ret.setTargetSdkVersion(p.getTargetSdkVersion());

            ret.setRestrictUpdateHash(p.getRestrictUpdateHash());

            ret.setRestrictUpdateHash(p.getRestrictUpdateHash());

        }

        }
@@ -1061,7 +1060,7 @@ public final class Settings implements Watchable, Snappable, ResilientAtomicFile 
            boolean virtualPreload, boolean isStoppedSystemApp, UserManagerService userManager,

            boolean virtualPreload, boolean isStoppedSystemApp, UserManagerService userManager,

            String[] usesSdkLibraries, long[] usesSdkLibrariesVersions,

            String[] usesSdkLibraries, long[] usesSdkLibrariesVersions,

            String[] usesStaticLibraries, long[] usesStaticLibrariesVersions,

            String[] usesStaticLibraries, long[] usesStaticLibrariesVersions,

            Set<String> mimeGroupNames, @NonNull UUID domainSetId, boolean isPersistent,

            Set<String> mimeGroupNames, @NonNull UUID domainSetId,

            int targetSdkVersion, byte[] restrictUpdatedHash) {

            int targetSdkVersion, byte[] restrictUpdatedHash) {

        final PackageSetting pkgSetting;

        final PackageSetting pkgSetting;

        if (originalPkg != null) {

        if (originalPkg != null) {
@@ -1083,7 +1082,6 @@ public final class Settings implements Watchable, Snappable, ResilientAtomicFile 
                    // Update new package state.

                    // Update new package state.

                    .setLastModifiedTime(codePath.lastModified())

                    .setLastModifiedTime(codePath.lastModified())

                    .setDomainSetId(domainSetId)

                    .setDomainSetId(domainSetId)

                    .setIsPersistent(isPersistent)

                    .setTargetSdkVersion(targetSdkVersion)

                    .setTargetSdkVersion(targetSdkVersion)

                    .setRestrictUpdateHash(restrictUpdatedHash);

                    .setRestrictUpdateHash(restrictUpdatedHash);

            pkgSetting.setFlags(pkgFlags)

            pkgSetting.setFlags(pkgFlags)
@@ -1103,7 +1101,6 @@ public final class Settings implements Watchable, Snappable, ResilientAtomicFile 
                    .setSecondaryCpuAbi(secondaryCpuAbi)

                    .setSecondaryCpuAbi(secondaryCpuAbi)

                    .setLongVersionCode(versionCode)

                    .setLongVersionCode(versionCode)

                    .setMimeGroups(createMimeGroups(mimeGroupNames))

                    .setMimeGroups(createMimeGroups(mimeGroupNames))

                    .setIsPersistent(isPersistent)

                    .setTargetSdkVersion(targetSdkVersion)

                    .setTargetSdkVersion(targetSdkVersion)

                    .setRestrictUpdateHash(restrictUpdatedHash)

                    .setRestrictUpdateHash(restrictUpdatedHash)

                    .setLastModifiedTime(codePath.lastModified());

                    .setLastModifiedTime(codePath.lastModified());
@@ -1219,7 +1216,7 @@ public final class Settings implements Watchable, Snappable, ResilientAtomicFile 
            int pkgPrivateFlags, @NonNull UserManagerService userManager,

            int pkgPrivateFlags, @NonNull UserManagerService userManager,

            @Nullable String[] usesSdkLibraries, @Nullable long[] usesSdkLibrariesVersions,

            @Nullable String[] usesSdkLibraries, @Nullable long[] usesSdkLibrariesVersions,

            @Nullable String[] usesStaticLibraries, @Nullable long[] usesStaticLibrariesVersions,

            @Nullable String[] usesStaticLibraries, @Nullable long[] usesStaticLibrariesVersions,

            @Nullable Set<String> mimeGroupNames, @NonNull UUID domainSetId, boolean isPersistent,

            @Nullable Set<String> mimeGroupNames, @NonNull UUID domainSetId,

            int targetSdkVersion, byte[] restrictUpdatedHash)

            int targetSdkVersion, byte[] restrictUpdatedHash)

                    throws PackageManagerException {

                    throws PackageManagerException {

        final String pkgName = pkgSetting.getPackageName();

        final String pkgName = pkgSetting.getPackageName();
@@ -1273,7 +1270,6 @@ public final class Settings implements Watchable, Snappable, ResilientAtomicFile 
                .setSecondaryCpuAbi(secondaryCpuAbi)

                .setSecondaryCpuAbi(secondaryCpuAbi)

                .updateMimeGroups(mimeGroupNames)

                .updateMimeGroups(mimeGroupNames)

                .setDomainSetId(domainSetId)

                .setDomainSetId(domainSetId)

                .setIsPersistent(isPersistent)

                .setTargetSdkVersion(targetSdkVersion)

                .setTargetSdkVersion(targetSdkVersion)

                .setRestrictUpdateHash(restrictUpdatedHash);

                .setRestrictUpdateHash(restrictUpdatedHash);

        // Update SDK library dependencies if needed.

        // Update SDK library dependencies if needed.
@@ -3071,7 +3067,6 @@ public final class Settings implements Watchable, Snappable, ResilientAtomicFile 
        serializer.attributeLongHex(null, "ft", pkg.getLastModifiedTime());

        serializer.attributeLongHex(null, "ft", pkg.getLastModifiedTime());

        serializer.attributeLongHex(null, "ut", pkg.getLastUpdateTime());

        serializer.attributeLongHex(null, "ut", pkg.getLastUpdateTime());

        serializer.attributeLong(null, "version", pkg.getVersionCode());

        serializer.attributeLong(null, "version", pkg.getVersionCode());

        serializer.attributeBoolean(null, "isPersistent", pkg.isPersistent());

        serializer.attributeInt(null, "targetSdkVersion", pkg.getTargetSdkVersion());

        serializer.attributeInt(null, "targetSdkVersion", pkg.getTargetSdkVersion());

        if (pkg.getRestrictUpdateHash() != null) {

        if (pkg.getRestrictUpdateHash() != null) {

            serializer.attributeBytesBase64(null, "restrictUpdateHash",

            serializer.attributeBytesBase64(null, "restrictUpdateHash",
@@ -3140,7 +3135,6 @@ public final class Settings implements Watchable, Snappable, ResilientAtomicFile 
        serializer.attributeLongHex(null, "ft", pkg.getLastModifiedTime());

        serializer.attributeLongHex(null, "ft", pkg.getLastModifiedTime());

        serializer.attributeLongHex(null, "ut", pkg.getLastUpdateTime());

        serializer.attributeLongHex(null, "ut", pkg.getLastUpdateTime());

        serializer.attributeLong(null, "version", pkg.getVersionCode());

        serializer.attributeLong(null, "version", pkg.getVersionCode());

        serializer.attributeBoolean(null, "isPersistent", pkg.isPersistent());

        serializer.attributeInt(null, "targetSdkVersion", pkg.getTargetSdkVersion());

        serializer.attributeInt(null, "targetSdkVersion", pkg.getTargetSdkVersion());

        if (pkg.getRestrictUpdateHash() != null) {

        if (pkg.getRestrictUpdateHash() != null) {

            serializer.attributeBytesBase64(null, "restrictUpdateHash",

            serializer.attributeBytesBase64(null, "restrictUpdateHash",
@@ -3182,8 +3176,6 @@ public final class Settings implements Watchable, Snappable, ResilientAtomicFile 
        if (pkg.getVolumeUuid() != null) {

        if (pkg.getVolumeUuid() != null) {

            serializer.attribute(null, "volumeUuid", pkg.getVolumeUuid());

            serializer.attribute(null, "volumeUuid", pkg.getVolumeUuid());

        }

        }

        serializer.attributeBoolean(null, "defaultToDeviceProtectedStorage",

                pkg.isDefaultToDeviceProtectedStorage());

        if (pkg.getCategoryOverride() != ApplicationInfo.CATEGORY_UNDEFINED) {

        if (pkg.getCategoryOverride() != ApplicationInfo.CATEGORY_UNDEFINED) {

            serializer.attributeInt(null, "categoryHint", pkg.getCategoryOverride());

            serializer.attributeInt(null, "categoryHint", pkg.getCategoryOverride());

        }

        }
@@ -3878,7 +3870,6 @@ public final class Settings implements Watchable, Snappable, ResilientAtomicFile 
        }

        }





        long versionCode = parser.getAttributeLong(null, "version", 0);

        long versionCode = parser.getAttributeLong(null, "version", 0);

        boolean isPersistent = parser.getAttributeBoolean(null, "isPersistent", false);

        int targetSdkVersion = parser.getAttributeInt(null, "targetSdkVersion", 0);

        int targetSdkVersion = parser.getAttributeInt(null, "targetSdkVersion", 0);

        byte[] restrictUpdateHash = parser.getAttributeBytesBase64(null, "restrictUpdateHash",

        byte[] restrictUpdateHash = parser.getAttributeBytesBase64(null, "restrictUpdateHash",

                null);

                null);
@@ -3901,7 +3892,6 @@ public final class Settings implements Watchable, Snappable, ResilientAtomicFile 
                .setSecondaryCpuAbi(secondaryCpuAbiStr)

                .setSecondaryCpuAbi(secondaryCpuAbiStr)

                .setCpuAbiOverride(cpuAbiOverrideStr)

                .setCpuAbiOverride(cpuAbiOverrideStr)

                .setLongVersionCode(versionCode)

                .setLongVersionCode(versionCode)

                .setIsPersistent(isPersistent)

                .setTargetSdkVersion(targetSdkVersion)

                .setTargetSdkVersion(targetSdkVersion)

                .setRestrictUpdateHash(restrictUpdateHash);

                .setRestrictUpdateHash(restrictUpdateHash);

        long timeStamp = parser.getAttributeLongHex(null, "ft", 0);

        long timeStamp = parser.getAttributeLongHex(null, "ft", 0);
@@ -3982,7 +3972,6 @@ public final class Settings implements Watchable, Snappable, ResilientAtomicFile 
        String installInitiatingPackageName = null;

        String installInitiatingPackageName = null;

        boolean installInitiatorUninstalled = false;

        boolean installInitiatorUninstalled = false;

        String volumeUuid = null;

        String volumeUuid = null;

        boolean defaultToDeviceProtectedStorage = false;

        boolean updateAvailable = false;

        boolean updateAvailable = false;

        int categoryHint = ApplicationInfo.CATEGORY_UNDEFINED;

        int categoryHint = ApplicationInfo.CATEGORY_UNDEFINED;

        int pkgFlags = 0;

        int pkgFlags = 0;
@@ -3997,7 +3986,6 @@ public final class Settings implements Watchable, Snappable, ResilientAtomicFile 
        long loadingCompletedTime = 0;

        long loadingCompletedTime = 0;

        UUID domainSetId;

        UUID domainSetId;

        String appMetadataFilePath = null;

        String appMetadataFilePath = null;

        boolean isPersistent = false;

        int targetSdkVersion = 0;

        int targetSdkVersion = 0;

        byte[] restrictUpdateHash = null;

        byte[] restrictUpdateHash = null;

        try {

        try {
@@ -4023,7 +4011,6 @@ public final class Settings implements Watchable, Snappable, ResilientAtomicFile 
            }

            }





            versionCode = parser.getAttributeLong(null, "version", 0);

            versionCode = parser.getAttributeLong(null, "version", 0);

            isPersistent = parser.getAttributeBoolean(null, "isPersistent", false);

            targetSdkVersion = parser.getAttributeInt(null, "targetSdkVersion", 0);

            targetSdkVersion = parser.getAttributeInt(null, "targetSdkVersion", 0);

            restrictUpdateHash = parser.getAttributeBytesBase64(null, "restrictUpdateHash", null);

            restrictUpdateHash = parser.getAttributeBytesBase64(null, "restrictUpdateHash", null);

            installerPackageName = parser.getAttributeValue(null, "installer");

            installerPackageName = parser.getAttributeValue(null, "installer");
@@ -4038,8 +4025,6 @@ public final class Settings implements Watchable, Snappable, ResilientAtomicFile 
            installInitiatorUninstalled = parser.getAttributeBoolean(null,

            installInitiatorUninstalled = parser.getAttributeBoolean(null,

                    "installInitiatorUninstalled", false);

                    "installInitiatorUninstalled", false);

            volumeUuid = parser.getAttributeValue(null, "volumeUuid");

            volumeUuid = parser.getAttributeValue(null, "volumeUuid");

            defaultToDeviceProtectedStorage = parser.getAttributeBoolean(

                    null, "defaultToDeviceProtectedStorage", false);

            categoryHint = parser.getAttributeInt(null, "categoryHint",

            categoryHint = parser.getAttributeInt(null, "categoryHint",

                    ApplicationInfo.CATEGORY_UNDEFINED);

                    ApplicationInfo.CATEGORY_UNDEFINED);

            appMetadataFilePath = parser.getAttributeValue(null, "appMetadataFilePath");

            appMetadataFilePath = parser.getAttributeValue(null, "appMetadataFilePath");
@@ -4179,7 +4164,6 @@ public final class Settings implements Watchable, Snappable, ResilientAtomicFile 
                    installInitiatorUninstalled);

                    installInitiatorUninstalled);

            packageSetting.setInstallSource(installSource)

            packageSetting.setInstallSource(installSource)

                    .setVolumeUuid(volumeUuid)

                    .setVolumeUuid(volumeUuid)

                    .setDefaultToDeviceProtectedStorage(defaultToDeviceProtectedStorage)

                    .setCategoryOverride(categoryHint)

                    .setCategoryOverride(categoryHint)

                    .setLegacyNativeLibraryPath(legacyNativeLibraryPathStr)

                    .setLegacyNativeLibraryPath(legacyNativeLibraryPathStr)

                    .setPrimaryCpuAbi(primaryCpuAbiString)

                    .setPrimaryCpuAbi(primaryCpuAbiString)
@@ -4189,7 +4173,6 @@ public final class Settings implements Watchable, Snappable, ResilientAtomicFile 
                    .setLoadingProgress(loadingProgress)

                    .setLoadingProgress(loadingProgress)

                    .setLoadingCompletedTime(loadingCompletedTime)

                    .setLoadingCompletedTime(loadingCompletedTime)

                    .setAppMetadataFilePath(appMetadataFilePath)

                    .setAppMetadataFilePath(appMetadataFilePath)

                    .setIsPersistent(isPersistent)

                    .setTargetSdkVersion(targetSdkVersion)

                    .setTargetSdkVersion(targetSdkVersion)

                    .setRestrictUpdateHash(restrictUpdateHash);

                    .setRestrictUpdateHash(restrictUpdateHash);

            // Handle legacy string here for single-user mode

            // Handle legacy string here for single-user mode