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

Commit 8ab1f82c authored by Khalid Ramadan's avatar Khalid Ramadan Committed by Automerger Merge Worker
Browse files

Merge "Send broadcast to SDK verifier." into tm-dev am: fb65642d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17047523

Change-Id: Ia1369ab9e24150cfedcf30bf4672816d261138b3
parents 0dab81cf fb65642d

core/api/module-lib-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ package android.content.pm { 
  public abstract class PackageManager {

    method @NonNull public String getPermissionControllerPackageName();

    method @NonNull public String getSdkSandboxPackageName();

    field public static final String EXTRA_VERIFICATION_ROOT_HASH = "android.content.pm.extra.VERIFICATION_ROOT_HASH";

    field public static final int MATCH_STATIC_SHARED_AND_SDK_LIBRARIES = 67108864; // 0x4000000

  }

core/java/android/content/pm/PackageInfoLite.java

+5 −0
Original line number Diff line number Diff line
@@ -78,6 +78,11 @@ public class PackageInfoLite implements Parcelable { 
     */

    public boolean debuggable;



    /**

     * Indicates if this apk is a sdk.

     */

    public boolean isSdkLibrary;



    /**

     * Specifies the recommended install location. Can be one of

     * {@link InstallLocationUtils#RECOMMEND_INSTALL_INTERNAL} to install on internal storage,

core/java/android/content/pm/PackageManager.java

+2 −1
Original line number Diff line number Diff line
@@ -4262,8 +4262,9 @@ public abstract class PackageManager { 
     * for more details.

     * @hide

     */

    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

    public static final String EXTRA_VERIFICATION_ROOT_HASH =

            "android.content.pm.extra.EXTRA_VERIFICATION_ROOT_HASH";

            "android.content.pm.extra.VERIFICATION_ROOT_HASH";



    /**

     * Extra field name for the ID of a intent filter pending verification.

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

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

    private final boolean mHasDeviceAdminReceiver;



    /**

     * Indicates if this apk is a sdk.

     */

    private final boolean mIsSdkLibrary;



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

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

            int versionCodeMajor, int revisionCode, int installLocation,
@@ -143,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 hasDeviceAdminReceiver, boolean isSdkLibrary) {

        mPath = path;

        mPackageName = packageName;

        mSplitName = splitName;
@@ -176,6 +181,7 @@ public class ApkLite { 
        mTargetSdkVersion = targetSdkVersion;

        mRollbackDataPolicy = rollbackDataPolicy;

        mHasDeviceAdminReceiver = hasDeviceAdminReceiver;

        mIsSdkLibrary = isSdkLibrary;

    }



    /**
@@ -473,11 +479,19 @@ public class ApkLite { 
        return mHasDeviceAdminReceiver;

    }



    /**

     * Indicates if this apk is a sdk.

     */

    @DataClass.Generated.Member

    public boolean isIsSdkLibrary() {

        return mIsSdkLibrary;

    }



    @DataClass.Generated(

            time = 1635266936769L,

            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\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

+6 −1
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ public class ApkLiteParseUtils { 
    private static final String TAG_USES_SDK = "uses-sdk";

    private static final String TAG_USES_SPLIT = "uses-split";

    private static final String TAG_MANIFEST = "manifest";

    private static final String TAG_SDK_LIBRARY = "sdk-library";

    private static final int SDK_VERSION = Build.VERSION.SDK_INT;

    private static final String[] SDK_CODENAMES = Build.VERSION.ACTIVE_CODENAMES;
@@ -449,6 +450,8 @@ public class ApkLiteParseUtils { 


        boolean hasDeviceAdminReceiver = false;



        boolean isSdkLibrary = false;



        // Only search the tree when the tag is the direct child of <manifest> tag

        int type;

        final int searchDepth = parser.getDepth() + 1;
@@ -506,6 +509,8 @@ public class ApkLiteParseUtils { 
                    } else if (TAG_RECEIVER.equals(parser.getName())) {

                        hasDeviceAdminReceiver |= isDeviceAdminReceiver(

                                parser, hasBindDeviceAdminPermission);

                    } else if (TAG_SDK_LIBRARY.equals(parser.getName())) {

                        isSdkLibrary = true;

                    }

                }

            } else if (TAG_OVERLAY.equals(parser.getName())) {
@@ -598,7 +603,7 @@ public class ApkLiteParseUtils { 
                        overlayIsStatic, overlayPriority, requiredSystemPropertyName,

                        requiredSystemPropertyValue, minSdkVersion, targetSdkVersion,

                        rollbackDataPolicy, requiredSplitTypes.first, requiredSplitTypes.second,

                        hasDeviceAdminReceiver));

                        hasDeviceAdminReceiver, isSdkLibrary));

    }



    private static boolean isDeviceAdminReceiver(