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

Commit 16e5b35e authored by Alex Buynytskyy's avatar Alex Buynytskyy
Browse files

Further install archived work. 

- removed unused flag,
- check package status before install.

Bug: 297916136
Test: atest PackageManagerTest PackageArchiverServiceTest
Change-Id: Iec9fba52ee19c4b3dae9d2d0f75b90daf6ec8381
parent a418a335

core/java/android/content/pm/ArchivedPackageParcel.aidl

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ parcelable ArchivedPackageParcel { 
    int versionCode;

    int versionCodeMajor;

    int targetSdkVersion;

    boolean clearUserDataAllowed;

    boolean backupAllowed;

    boolean defaultToDeviceProtectedStorage;

    boolean requestLegacyExternalStorage;

core/java/android/content/pm/parsing/ApkLite.java

+2 −17
Original line number Diff line number Diff line
@@ -139,11 +139,6 @@ public class ApkLite { 
     */

    private final boolean mIsSdkLibrary;



    /**

     * Indicates whether this application's data will be cleared on a failed restore.

     */

    private final boolean mClearUserDataAllowed;



    /**

     *  Set to <code>false</code> if the application does not wish to permit any OS-driven

     *  backups of its data; <code>true</code> otherwise.
@@ -219,7 +214,6 @@ public class ApkLite { 
        mRollbackDataPolicy = rollbackDataPolicy;

        mHasDeviceAdminReceiver = hasDeviceAdminReceiver;

        mIsSdkLibrary = isSdkLibrary;

        mClearUserDataAllowed = clearUserDataAllowed;

        mBackupAllowed = backupAllowed;

        mDefaultToDeviceProtectedStorage = defaultToDeviceProtectedStorage;

        mRequestLegacyExternalStorage = requestLegacyExternalStorage;
@@ -261,7 +255,6 @@ public class ApkLite { 
        mRollbackDataPolicy = 0;

        mHasDeviceAdminReceiver = false;

        mIsSdkLibrary = false;

        mClearUserDataAllowed = archivedPackage.clearUserDataAllowed;

        mBackupAllowed = archivedPackage.backupAllowed;

        mDefaultToDeviceProtectedStorage = archivedPackage.defaultToDeviceProtectedStorage;

        mRequestLegacyExternalStorage = archivedPackage.requestLegacyExternalStorage;
@@ -575,14 +568,6 @@ public class ApkLite { 
        return mIsSdkLibrary;

    }



    /**

     * Indicates whether this application's data will be cleared on a failed restore.

     */

    @DataClass.Generated.Member

    public boolean isClearUserDataAllowed() {

        return mClearUserDataAllowed;

    }



    /**

     *  Set to <code>false</code> if the application does not wish to permit any OS-driven

     *  backups of its data; <code>true</code> otherwise.
@@ -627,10 +612,10 @@ public class ApkLite { 
    }



    @DataClass.Generated(

            time = 1693422809896L,

            time = 1693513509013L,

            codegenVersion = "1.0.23",

            sourceFile = "frameworks/base/core/java/android/content/pm/parsing/ApkLite.java",

            inputSignatures = "private final @android.annotation.NonNull java.lang.String mPackageName\nprivate final @android.annotation.NonNull java.lang.String mPath\nprivate final @android.annotation.Nullable java.lang.String mSplitName\nprivate final @android.annotation.Nullable java.lang.String mUsesSplitName\nprivate final @android.annotation.Nullable java.lang.String mConfigForSplit\nprivate final @android.annotation.Nullable java.util.Set<java.lang.String> mRequiredSplitTypes\nprivate final @android.annotation.Nullable java.util.Set<java.lang.String> mSplitTypes\nprivate final  int mVersionCodeMajor\nprivate final  int mVersionCode\nprivate final  int mRevisionCode\nprivate final  int mInstallLocation\nprivate final  int mMinSdkVersion\nprivate final  int mTargetSdkVersion\nprivate final @android.annotation.NonNull android.content.pm.VerifierInfo[] mVerifiers\nprivate final @android.annotation.NonNull android.content.pm.SigningDetails mSigningDetails\nprivate final  boolean mFeatureSplit\nprivate final  boolean mIsolatedSplits\nprivate final  boolean mSplitRequired\nprivate final  boolean mCoreApp\nprivate final  boolean mDebuggable\nprivate final  boolean mProfileableByShell\nprivate final  boolean mMultiArch\nprivate final  boolean mUse32bitAbi\nprivate final  boolean mExtractNativeLibs\nprivate final  boolean mUseEmbeddedDex\nprivate final @android.annotation.Nullable java.lang.String mTargetPackageName\nprivate final  boolean mOverlayIsStatic\nprivate final  int mOverlayPriority\nprivate final @android.annotation.Nullable java.lang.String mRequiredSystemPropertyName\nprivate final @android.annotation.Nullable java.lang.String mRequiredSystemPropertyValue\nprivate final  int mRollbackDataPolicy\nprivate final  boolean mHasDeviceAdminReceiver\nprivate final  boolean mIsSdkLibrary\nprivate final  boolean mClearUserDataAllowed\nprivate final  boolean mBackupAllowed\nprivate final  boolean mDefaultToDeviceProtectedStorage\nprivate final  boolean mRequestLegacyExternalStorage\nprivate final  boolean mUserDataFragile\nprivate final  boolean mClearUserDataOnFailedRestoreAllowed\npublic  long getLongVersionCode()\nprivate  boolean hasAnyRequiredSplitTypes()\nclass ApkLite extends java.lang.Object implements []\n@com.android.internal.util.DataClass(genConstructor=false, genConstDefs=false)")

            inputSignatures = "private final @android.annotation.NonNull java.lang.String mPackageName\nprivate final @android.annotation.NonNull java.lang.String mPath\nprivate final @android.annotation.Nullable java.lang.String mSplitName\nprivate final @android.annotation.Nullable java.lang.String mUsesSplitName\nprivate final @android.annotation.Nullable java.lang.String mConfigForSplit\nprivate final @android.annotation.Nullable java.util.Set<java.lang.String> mRequiredSplitTypes\nprivate final @android.annotation.Nullable java.util.Set<java.lang.String> mSplitTypes\nprivate final  int mVersionCodeMajor\nprivate final  int mVersionCode\nprivate final  int mRevisionCode\nprivate final  int mInstallLocation\nprivate final  int mMinSdkVersion\nprivate final  int mTargetSdkVersion\nprivate final @android.annotation.NonNull android.content.pm.VerifierInfo[] mVerifiers\nprivate final @android.annotation.NonNull android.content.pm.SigningDetails mSigningDetails\nprivate final  boolean mFeatureSplit\nprivate final  boolean mIsolatedSplits\nprivate final  boolean mSplitRequired\nprivate final  boolean mCoreApp\nprivate final  boolean mDebuggable\nprivate final  boolean mProfileableByShell\nprivate final  boolean mMultiArch\nprivate final  boolean mUse32bitAbi\nprivate final  boolean mExtractNativeLibs\nprivate final  boolean mUseEmbeddedDex\nprivate final @android.annotation.Nullable java.lang.String mTargetPackageName\nprivate final  boolean mOverlayIsStatic\nprivate final  int mOverlayPriority\nprivate final @android.annotation.Nullable java.lang.String mRequiredSystemPropertyName\nprivate final @android.annotation.Nullable java.lang.String mRequiredSystemPropertyValue\nprivate final  int mRollbackDataPolicy\nprivate final  boolean mHasDeviceAdminReceiver\nprivate final  boolean mIsSdkLibrary\nprivate final  boolean mBackupAllowed\nprivate final  boolean mDefaultToDeviceProtectedStorage\nprivate final  boolean mRequestLegacyExternalStorage\nprivate final  boolean mUserDataFragile\nprivate final  boolean mClearUserDataOnFailedRestoreAllowed\npublic  long getLongVersionCode()\nprivate  boolean hasAnyRequiredSplitTypes()\nclass ApkLite extends java.lang.Object implements []\n@com.android.internal.util.DataClass(genConstructor=false, genConstDefs=false)")

    @Deprecated

    private void __metadata() {}

core/java/android/content/pm/parsing/PackageLite.java

+2 −15
Original line number Diff line number Diff line
@@ -112,10 +112,6 @@ public class PackageLite { 
     * Indicates if this package is a sdk.

     */

    private final boolean mIsSdkLibrary;

    /**

     * Indicates whether this application's data will be cleared on a failed restore.

     */

    private final boolean mClearUserDataAllowed;

    /**

     *  Set to <code>false</code> if the application does not wish to permit any OS-driven

     *  backups of its data; <code>true</code> otherwise.
@@ -175,7 +171,6 @@ public class PackageLite { 
        mSplitApkPaths = splitApkPaths;

        mSplitRevisionCodes = splitRevisionCodes;

        mTargetSdk = targetSdk;

        mClearUserDataAllowed = baseApk.isClearUserDataAllowed();

        mBackupAllowed = baseApk.isBackupAllowed();

        mDefaultToDeviceProtectedStorage = baseApk.isDefaultToDeviceProtectedStorage();

        mRequestLegacyExternalStorage = baseApk.isRequestLegacyExternalStorage();
@@ -459,14 +454,6 @@ public class PackageLite { 
        return mIsSdkLibrary;

    }



    /**

     * Indicates whether this application's data will be cleared on a failed restore.

     */

    @DataClass.Generated.Member

    public boolean isClearUserDataAllowed() {

        return mClearUserDataAllowed;

    }



    /**

     *  Set to <code>false</code> if the application does not wish to permit any OS-driven

     *  backups of its data; <code>true</code> otherwise.
@@ -511,10 +498,10 @@ public class PackageLite { 
    }



    @DataClass.Generated(

            time = 1693423910860L,

            time = 1693513525097L,

            codegenVersion = "1.0.23",

            sourceFile = "frameworks/base/core/java/android/content/pm/parsing/PackageLite.java",

            inputSignatures = "private final @android.annotation.NonNull java.lang.String mPackageName\nprivate final @android.annotation.NonNull java.lang.String mPath\nprivate final @android.annotation.NonNull java.lang.String mBaseApkPath\nprivate final @android.annotation.Nullable java.lang.String[] mSplitApkPaths\nprivate final @android.annotation.Nullable java.lang.String[] mSplitNames\nprivate final @android.annotation.Nullable java.lang.String[] mUsesSplitNames\nprivate final @android.annotation.Nullable java.lang.String[] mConfigForSplit\nprivate final @android.annotation.Nullable java.util.Set<java.lang.String> mBaseRequiredSplitTypes\nprivate final @android.annotation.Nullable java.util.Set<java.lang.String>[] mRequiredSplitTypes\nprivate final @android.annotation.Nullable java.util.Set<java.lang.String>[] mSplitTypes\nprivate final  int mVersionCodeMajor\nprivate final  int mVersionCode\nprivate final  int mTargetSdk\nprivate final  int mBaseRevisionCode\nprivate final @android.annotation.Nullable int[] mSplitRevisionCodes\nprivate final  int mInstallLocation\nprivate final @android.annotation.NonNull android.content.pm.VerifierInfo[] mVerifiers\nprivate final @android.annotation.NonNull android.content.pm.SigningDetails mSigningDetails\nprivate final @android.annotation.Nullable boolean[] mIsFeatureSplits\nprivate final  boolean mIsolatedSplits\nprivate final  boolean mSplitRequired\nprivate final  boolean mCoreApp\nprivate final  boolean mDebuggable\nprivate final  boolean mMultiArch\nprivate final  boolean mUse32bitAbi\nprivate final  boolean mExtractNativeLibs\nprivate final  boolean mProfileableByShell\nprivate final  boolean mUseEmbeddedDex\nprivate final  boolean mIsSdkLibrary\nprivate final  boolean mClearUserDataAllowed\nprivate final  boolean mBackupAllowed\nprivate final  boolean mDefaultToDeviceProtectedStorage\nprivate final  boolean mRequestLegacyExternalStorage\nprivate final  boolean mUserDataFragile\nprivate final  boolean mClearUserDataOnFailedRestoreAllowed\npublic  java.util.List<java.lang.String> getAllApkPaths()\npublic  long getLongVersionCode()\nprivate  boolean hasAnyRequiredSplitTypes()\nclass PackageLite extends java.lang.Object implements []\n@com.android.internal.util.DataClass(genConstructor=false, genConstDefs=false)")

            inputSignatures = "private final @android.annotation.NonNull java.lang.String mPackageName\nprivate final @android.annotation.NonNull java.lang.String mPath\nprivate final @android.annotation.NonNull java.lang.String mBaseApkPath\nprivate final @android.annotation.Nullable java.lang.String[] mSplitApkPaths\nprivate final @android.annotation.Nullable java.lang.String[] mSplitNames\nprivate final @android.annotation.Nullable java.lang.String[] mUsesSplitNames\nprivate final @android.annotation.Nullable java.lang.String[] mConfigForSplit\nprivate final @android.annotation.Nullable java.util.Set<java.lang.String> mBaseRequiredSplitTypes\nprivate final @android.annotation.Nullable java.util.Set<java.lang.String>[] mRequiredSplitTypes\nprivate final @android.annotation.Nullable java.util.Set<java.lang.String>[] mSplitTypes\nprivate final  int mVersionCodeMajor\nprivate final  int mVersionCode\nprivate final  int mTargetSdk\nprivate final  int mBaseRevisionCode\nprivate final @android.annotation.Nullable int[] mSplitRevisionCodes\nprivate final  int mInstallLocation\nprivate final @android.annotation.NonNull android.content.pm.VerifierInfo[] mVerifiers\nprivate final @android.annotation.NonNull android.content.pm.SigningDetails mSigningDetails\nprivate final @android.annotation.Nullable boolean[] mIsFeatureSplits\nprivate final  boolean mIsolatedSplits\nprivate final  boolean mSplitRequired\nprivate final  boolean mCoreApp\nprivate final  boolean mDebuggable\nprivate final  boolean mMultiArch\nprivate final  boolean mUse32bitAbi\nprivate final  boolean mExtractNativeLibs\nprivate final  boolean mProfileableByShell\nprivate final  boolean mUseEmbeddedDex\nprivate final  boolean mIsSdkLibrary\nprivate final  boolean mBackupAllowed\nprivate final  boolean mDefaultToDeviceProtectedStorage\nprivate final  boolean mRequestLegacyExternalStorage\nprivate final  boolean mUserDataFragile\nprivate final  boolean mClearUserDataOnFailedRestoreAllowed\npublic  java.util.List<java.lang.String> getAllApkPaths()\npublic  long getLongVersionCode()\nprivate  boolean hasAnyRequiredSplitTypes()\nclass PackageLite extends java.lang.Object implements []\n@com.android.internal.util.DataClass(genConstructor=false, genConstDefs=false)")

    @Deprecated

    private void __metadata() {}

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

+1 −3
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ import static android.os.incremental.IncrementalManager.isIncrementalPath; 
import static android.os.storage.StorageManager.FLAG_STORAGE_CE;

import static android.os.storage.StorageManager.FLAG_STORAGE_DE;

import static android.os.storage.StorageManager.FLAG_STORAGE_EXTERNAL;



import static com.android.server.pm.DexOptHelper.useArtService;

import static com.android.server.pm.InstructionSets.getAppDexInstructionSets;

import static com.android.server.pm.InstructionSets.getDexCodeInstructionSet;
@@ -1144,8 +1143,7 @@ final class InstallPackageHelper { 
        Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "parsePackage");

        final ParsedPackage parsedPackage;

        try (PackageParser2 pp = mPm.mInjector.getPreparingPackageParser()) {

            if (request.getPackageLite() == null || !PackageInstallerSession.isArchivedInstallation(

                    request.getInstallFlags())) {

            if (request.getPackageLite() == null || !request.isArchived()) {

                // TODO: pass packageLite from install request instead of reparsing the package

                parsedPackage = pp.parsePackage(tmpPackageFile, parseFlags, false);

                AndroidPackageUtils.validatePackageDexMetadata(parsedPackage);

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

+4 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import static android.content.pm.PackageManager.INSTALL_REASON_UNKNOWN; 
import static android.content.pm.PackageManager.INSTALL_SCENARIO_DEFAULT;

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

import static android.os.Process.INVALID_UID;



import static com.android.server.pm.PackageManagerService.SCAN_AS_INSTANT_APP;

import static com.android.server.pm.PackageManagerService.TAG;
@@ -327,6 +326,10 @@ final class InstallRequest { 
        return mRemovedInfo != null && mRemovedInfo.mRemovedPackage != null;

    }



    public boolean isArchived() {

        return PackageInstallerSession.isArchivedInstallation(getInstallFlags());

    }



    @Nullable

    public String getRemovedPackage() {

        return mRemovedInfo != null ? mRemovedInfo.mRemovedPackage : null;