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

Commit 19bd7034 authored by Joanne Chung's avatar Joanne Chung Committed by Android (Google) Code Review
Browse files

Merge "Introduce a new use-sdk-lib attribute: optional, default false" into main

parents 4fcbdd9d e1da3aea

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1216,6 +1216,7 @@ package android { 
    field public static final int opticalInsetLeft = 16844168; // 0x1010588

    field public static final int opticalInsetRight = 16844170; // 0x101058a

    field public static final int opticalInsetTop = 16844169; // 0x1010589

    field @FlaggedApi("android.content.pm.sdk_lib_independence") public static final int optional;

    field public static final int order = 16843242; // 0x10101ea

    field public static final int orderInCategory = 16843231; // 0x10101df

    field public static final int ordering = 16843490; // 0x10102e2

core/java/android/content/pm/SharedLibraryInfo.java

+4 −2
Original line number Diff line number Diff line
@@ -142,8 +142,10 @@ public final class SharedLibraryInfo implements Parcelable { 
        mName = parcel.readString8();

        mVersion = parcel.readLong();

        mType = parcel.readInt();

        mDeclaringPackage = parcel.readParcelable(null, android.content.pm.VersionedPackage.class);

        mDependentPackages = parcel.readArrayList(null, android.content.pm.VersionedPackage.class);

        mDeclaringPackage =

                parcel.readParcelable(null, android.content.pm.VersionedPackage.class);

        mDependentPackages =

                parcel.readArrayList(null, android.content.pm.VersionedPackage.class);

        mDependencies = parcel.createTypedArrayList(SharedLibraryInfo.CREATOR);

        mIsNative = parcel.readBoolean();

    }

core/java/com/android/internal/pm/pkg/parsing/ParsingPackage.java

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ public interface ParsingPackage { 
    ParsingPackage addUsesOptionalNativeLibrary(String libraryName);



    ParsingPackage addUsesSdkLibrary(String libraryName, long versionMajor,

            String[] certSha256Digests);

            String[] certSha256Digests, boolean usesSdkLibrariesOptional);



    ParsingPackage addUsesStaticLibrary(String libraryName, long version,

            String[] certSha256Digests);

core/java/com/android/server/pm/pkg/AndroidPackage.java

+9 −0
Original line number Diff line number Diff line
@@ -1340,6 +1340,15 @@ public interface AndroidPackage { 
    @Nullable

    long[] getUsesSdkLibrariesVersionsMajor();





    /**

     * @see R.styleable#AndroidManifestUsesSdkLibrary_optional

     * @hide

     */

    @Immutable.Ignore

    @Nullable

    boolean[] getUsesSdkLibrariesOptional();



    /**

     * TODO(b/135203078): Move static library stuff to an inner data class

     *

core/res/res/values/attrs_manifest.xml

+4 −0
Original line number Diff line number Diff line
@@ -2515,6 +2515,10 @@ 
        <attr name="versionMajor" format="integer" />

        <!-- The SHA-256 digest of the SDK library signing certificate. -->

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

        <!-- Specify whether the SDK is optional. The default is false, false means app can be

        installed even if the SDK library doesn't exist, and the SDK library can be uninstalled

        when the app is still installed. -->

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

    </declare-styleable>



    <!-- The <code>static-library</code> tag declares that this apk is providing itself