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

Commit d83a9ca3 authored by Patrick Baumann's avatar Patrick Baumann Committed by Android (Google) Code Review
Browse files

Merge changes from topic "cherrypick-revert_allowUpdateOwnership" into udc-dev 

* changes:
  Revert "Add new manifest attr allowUpdateOwnership (4/n)"
  Revert "App may trigger bypass of update owner enforcement"
parents d41919d2 08c993b8

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

+3 −20
Original line number Diff line number Diff line
@@ -138,11 +138,6 @@ public class ApkLite { 
     */

    private final boolean mIsSdkLibrary;



    /**

     * Indicates if this package allows an installer to declare update ownership of it.

     */

    private final boolean mAllowUpdateOwnership;



    public ApkLite(String path, String packageName, String splitName, boolean isFeatureSplit,

            String configForSplit, String usesSplitName, boolean isSplitRequired, int versionCode,

            int versionCodeMajor, int revisionCode, int installLocation,
@@ -153,7 +148,7 @@ public class ApkLite { 
            String requiredSystemPropertyName, String requiredSystemPropertyValue,

            int minSdkVersion, int targetSdkVersion, int rollbackDataPolicy,

            Set<String> requiredSplitTypes, Set<String> splitTypes,

            boolean hasDeviceAdminReceiver, boolean isSdkLibrary, boolean allowUpdateOwnership) {

            boolean hasDeviceAdminReceiver, boolean isSdkLibrary) {

        mPath = path;

        mPackageName = packageName;

        mSplitName = splitName;
@@ -187,7 +182,6 @@ public class ApkLite { 
        mRollbackDataPolicy = rollbackDataPolicy;

        mHasDeviceAdminReceiver = hasDeviceAdminReceiver;

        mIsSdkLibrary = isSdkLibrary;

        mAllowUpdateOwnership = allowUpdateOwnership;

    }



    /**
@@ -480,9 +474,6 @@ public class ApkLite { 
        return mRollbackDataPolicy;

    }



    /**

     * Indicates if this app contains a {@link android.app.admin.DeviceAdminReceiver}.

     */

    @DataClass.Generated.Member

    public boolean isHasDeviceAdminReceiver() {

        return mHasDeviceAdminReceiver;
@@ -496,19 +487,11 @@ public class ApkLite { 
        return mIsSdkLibrary;

    }



    /**

     * Indicates if this package allows an installer to declare update ownership of it.

     */

    @DataClass.Generated.Member

    public boolean isAllowUpdateOwnership() {

        return mAllowUpdateOwnership;

    }



    @DataClass.Generated(

            time = 1680122754650L,

            time = 1643063342990L,

            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 mAllowUpdateOwnership\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\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/ApkLiteParseUtils.java

+4 −9
Original line number Diff line number Diff line
@@ -127,8 +127,7 @@ public class ApkLiteParseUtils { 
                            null /* isFeatureSplits */, null /* usesSplitNames */,

                            null /* configForSplit */, null /* splitApkPaths */,

                            null /* splitRevisionCodes */, baseApk.getTargetSdkVersion(),

                            null /* requiredSplitTypes */, null, /* splitTypes */

                            baseApk.isAllowUpdateOwnership()));

                            null /* requiredSplitTypes */, null /* splitTypes */));

        } finally {

            Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER);

        }
@@ -154,8 +153,7 @@ public class ApkLiteParseUtils { 
                            null /* isFeatureSplits */, null /* usesSplitNames */,

                            null /* configForSplit */, null /* splitApkPaths */,

                            null /* splitRevisionCodes */, baseApk.getTargetSdkVersion(),

                            null /* requiredSplitTypes */, null, /* splitTypes */

                            baseApk.isAllowUpdateOwnership()));

                            null /* requiredSplitTypes */, null /* splitTypes */));

        } finally {

            Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER);

        }
@@ -301,8 +299,7 @@ public class ApkLiteParseUtils { 
        return input.success(

                new PackageLite(codePath, baseCodePath, baseApk, splitNames, isFeatureSplits,

                        usesSplitNames, configForSplits, splitCodePaths, splitRevisionCodes,

                        baseApk.getTargetSdkVersion(), requiredSplitTypes, splitTypes,

                        baseApk.isAllowUpdateOwnership()));

                        baseApk.getTargetSdkVersion(), requiredSplitTypes, splitTypes));

    }



    /**
@@ -429,8 +426,6 @@ public class ApkLiteParseUtils { 
                "isFeatureSplit", false);

        boolean isSplitRequired = parser.getAttributeBooleanValue(ANDROID_RES_NAMESPACE,

                "isSplitRequired", false);

        boolean allowUpdateOwnership = parser.getAttributeBooleanValue(ANDROID_RES_NAMESPACE,

                "allowUpdateOwnership", true);

        String configForSplit = parser.getAttributeValue(null, "configForSplit");



        int targetSdkVersion = DEFAULT_TARGET_SDK_VERSION;
@@ -614,7 +609,7 @@ public class ApkLiteParseUtils { 
                        overlayIsStatic, overlayPriority, requiredSystemPropertyName,

                        requiredSystemPropertyValue, minSdkVersion, targetSdkVersion,

                        rollbackDataPolicy, requiredSplitTypes.first, requiredSplitTypes.second,

                        hasDeviceAdminReceiver, isSdkLibrary, allowUpdateOwnership));

                        hasDeviceAdminReceiver, isSdkLibrary));

    }



    private static boolean isDeviceAdminReceiver(

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

+4 −18
Original line number Diff line number Diff line
@@ -110,16 +110,10 @@ public class PackageLite { 
     */

    private final boolean mIsSdkLibrary;



    /**

     * Indicates if this package allows an installer to declare update ownership of it.

     */

    private final boolean mAllowUpdateOwnership;



    public PackageLite(String path, String baseApkPath, ApkLite baseApk,

            String[] splitNames, boolean[] isFeatureSplits, String[] usesSplitNames,

            String[] configForSplit, String[] splitApkPaths, int[] splitRevisionCodes,

            int targetSdk, Set<String>[] requiredSplitTypes, Set<String>[] splitTypes,

            boolean allowUpdateOwnership) {

            int targetSdk, Set<String>[] requiredSplitTypes, Set<String>[] splitTypes) {

        // The following paths may be different from the path in ApkLite because we

        // move or rename the APK files. Use parameters to indicate the correct paths.

        mPath = path;
@@ -150,7 +144,6 @@ public class PackageLite { 
        mSplitApkPaths = splitApkPaths;

        mSplitRevisionCodes = splitRevisionCodes;

        mTargetSdk = targetSdk;

        mAllowUpdateOwnership = allowUpdateOwnership;

    }



    /**
@@ -421,19 +414,12 @@ public class PackageLite { 
        return mIsSdkLibrary;

    }



    /**

     * Indicates if this package allows an installer to declare update ownership of it.

     */

    @DataClass.Generated.Member

    public boolean isAllowUpdateOwnership() {

        return mAllowUpdateOwnership;

    }



    @DataClass.Generated(

            time = 1680125514341L,

            time = 1643132127068L,

            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.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 mAllowUpdateOwnership\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.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\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() {}

core/res/res/values/attrs_manifest.xml

+0 −7
Original line number Diff line number Diff line
@@ -1797,12 +1797,6 @@ 
    -->

    <attr name="attributionTags" format="string" />



    <!-- Default value <code>true</code> allows an installer to enable update

         ownership enforcement for this package via {@link

         android.content.pm.PackageInstaller.SessionParams#setRequestUpdateOwnership}

         during initial installation. This overrides the installer's use of {@link

         android.content.pm.PackageInstaller.SessionParams#setRequestUpdateOwnership}.

    -->

    <attr name="allowUpdateOwnership" format="boolean" />



    <!-- The <code>manifest</code> tag is the root of an
@@ -1842,7 +1836,6 @@ 
        <attr name="isSplitRequired" />

        <attr name="requiredSplitTypes" />

        <attr name="splitTypes" />

        <attr name="allowUpdateOwnership" />

    </declare-styleable>



    <!-- The <code>application</code> tag describes application-level components

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

+12 −21
Original line number Diff line number Diff line
@@ -324,7 +324,6 @@ final class InstallPackageHelper { 
        InstallSource installSource = request.getInstallSource();

        final boolean isApex = (scanFlags & SCAN_AS_APEX) != 0;

        final boolean pkgAlreadyExists = oldPkgSetting != null;

        final boolean isAllowUpdateOwnership = parsedPackage.isAllowUpdateOwnership();

        final String oldUpdateOwner =

                pkgAlreadyExists ? oldPkgSetting.getInstallSource().mUpdateOwnerPackageName : null;

        final String updateOwnerFromSysconfig = isApex || !pkgSetting.isSystem() ? null
@@ -346,11 +345,7 @@ final class InstallPackageHelper { 
            }



            // Handle the update ownership enforcement for APK

            if (!isAllowUpdateOwnership) {

                // If the app wants to opt-out of the update ownership enforcement via manifest,

                // it overrides the installer's use of #setRequestUpdateOwnership.

                installSource = installSource.setUpdateOwnerPackageName(null);

            } else if (!isApex) {

            if (!isApex) {

                // User installer UID as "current" userId if present; otherwise, use the userId

                // from InstallRequest.

                final int userId = installSource.mInstallerPackageUid != Process.INVALID_UID
@@ -391,9 +386,6 @@ final class InstallPackageHelper { 
        // For non-standard install (addForInit), installSource is null.

        } else if (pkgSetting.isSystem()) {

            // We still honor the manifest attr if the system app wants to opt-out of it.

            if (!isAllowUpdateOwnership) {

                pkgSetting.setUpdateOwnerPackage(null);

            } else {

            final boolean isSameUpdateOwner = isUpdateOwnershipEnabled

                    && TextUtils.equals(oldUpdateOwner, updateOwnerFromSysconfig);
@@ -408,7 +400,6 @@ final class InstallPackageHelper { 
                pkgSetting.setUpdateOwnerPackage(null);

            }

        }

        }



        if ((scanFlags & SCAN_AS_APK_IN_APEX) != 0) {

            boolean isFactory = (scanFlags & SCAN_AS_FACTORY) != 0;