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

Commit 0ac143f3 authored by Jackal Guo's avatar Jackal Guo
Browse files

Revise the return type of #getLabel 

Address the feedback of API review, and change the return type
to CharSequence.

Bug: 255592779
Test: atest CtsContentTestCases:PreapprovalDetailsTest
Test: atest CtsPackageInstallTestCases:PreapprovalInstallTest
Change-Id: I777d54e8b9614f87c8a899c49ea476792ca8c515
parent 42319e3c

core/api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -11647,7 +11647,7 @@ package android.content.pm { 
  public static final class PackageInstaller.PreapprovalDetails implements android.os.Parcelable {

    method public int describeContents();

    method @Nullable public android.graphics.Bitmap getIcon();

    method @NonNull public String getLabel();

    method @NonNull public CharSequence getLabel();

    method @NonNull public android.icu.util.ULocale getLocale();

    method @NonNull public String getPackageName();

    method public void writeToParcel(@NonNull android.os.Parcel, int);
@@ -11658,7 +11658,7 @@ package android.content.pm { 
    ctor public PackageInstaller.PreapprovalDetails.Builder();

    method @NonNull public android.content.pm.PackageInstaller.PreapprovalDetails build();

    method @NonNull public android.content.pm.PackageInstaller.PreapprovalDetails.Builder setIcon(@NonNull android.graphics.Bitmap);

    method @NonNull public android.content.pm.PackageInstaller.PreapprovalDetails.Builder setLabel(@NonNull String);

    method @NonNull public android.content.pm.PackageInstaller.PreapprovalDetails.Builder setLabel(@NonNull CharSequence);

    method @NonNull public android.content.pm.PackageInstaller.PreapprovalDetails.Builder setLocale(@NonNull android.icu.util.ULocale);

    method @NonNull public android.content.pm.PackageInstaller.PreapprovalDetails.Builder setPackageName(@NonNull String);

  }

core/java/android/content/pm/PackageInstaller.java

+9 −9
Original line number Diff line number Diff line
@@ -3346,7 +3346,7 @@ public class PackageInstaller { 
        /**

         * The label representing the app to be installed.

         */

        private final @NonNull String mLabel;

        private final @NonNull CharSequence mLabel;

        /**

         * The locale of the app label being used.

         */
@@ -3388,7 +3388,7 @@ public class PackageInstaller { 
        @DataClass.Generated.Member

        public PreapprovalDetails(

                @Nullable Bitmap icon,

                @NonNull String label,

                @NonNull CharSequence label,

                @NonNull ULocale locale,

                @NonNull String packageName) {

            this.mIcon = icon;
@@ -3417,7 +3417,7 @@ public class PackageInstaller { 
         * The label representing the app to be installed.

         */

        @DataClass.Generated.Member

        public @NonNull String getLabel() {

        public @NonNull CharSequence getLabel() {

            return mLabel;

        }
@@ -3461,7 +3461,7 @@ public class PackageInstaller { 
            if (mIcon != null) flg |= 0x1;

            dest.writeByte(flg);

            if (mIcon != null) mIcon.writeToParcel(dest, flags);

            dest.writeString8(mLabel);

            dest.writeCharSequence(mLabel);

            dest.writeString8(mLocale.toString());

            dest.writeString8(mPackageName);

        }
@@ -3479,7 +3479,7 @@ public class PackageInstaller { 


            byte flg = in.readByte();

            Bitmap icon = (flg & 0x1) == 0 ? null : Bitmap.CREATOR.createFromParcel(in);

            String label = in.readString8();

            CharSequence label = (CharSequence) in.readCharSequence();

            ULocale locale = new ULocale(in.readString8());

            String packageName = in.readString8();
@@ -3519,7 +3519,7 @@ public class PackageInstaller { 
        public static final class Builder {



            private @Nullable Bitmap mIcon;

            private @NonNull String mLabel;

            private @NonNull CharSequence mLabel;

            private @NonNull ULocale mLocale;

            private @NonNull String mPackageName;
@@ -3545,7 +3545,7 @@ public class PackageInstaller { 
             * The label representing the app to be installed.

             */

            @DataClass.Generated.Member

            public @NonNull Builder setLabel(@NonNull String value) {

            public @NonNull Builder setLabel(@NonNull CharSequence value) {

                checkNotUsed();

                mBuilderFieldsSet |= 0x2;

                mLabel = value;
@@ -3596,10 +3596,10 @@ public class PackageInstaller { 
        }



        @DataClass.Generated(

                time = 1664257135109L,

                time = 1666748098353L,

                codegenVersion = "1.0.23",

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

                inputSignatures = "private final @android.annotation.Nullable android.graphics.Bitmap mIcon\nprivate final @android.annotation.NonNull java.lang.String mLabel\nprivate final @android.annotation.NonNull android.icu.util.ULocale mLocale\nprivate final @android.annotation.NonNull java.lang.String mPackageName\nclass PreapprovalDetails extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genParcelable=true, genHiddenConstructor=true, genBuilder=true, genToString=true)")

                inputSignatures = "private final @android.annotation.Nullable android.graphics.Bitmap mIcon\nprivate final @android.annotation.NonNull java.lang.CharSequence mLabel\nprivate final @android.annotation.NonNull android.icu.util.ULocale mLocale\nprivate final @android.annotation.NonNull java.lang.String mPackageName\nclass PreapprovalDetails extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genParcelable=true, genHiddenConstructor=true, genBuilder=true, genToString=true)")

        @Deprecated

        private void __metadata() {}

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

+1 −1
Original line number Diff line number Diff line
@@ -3326,7 +3326,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
                    "Failure to obtain package info.");

        }

        final List<String> filePaths = packageLite.getAllApkPaths();

        final String appLabel = mPreapprovalDetails.getLabel();

        final CharSequence appLabel = mPreapprovalDetails.getLabel();

        final ULocale appLocale = mPreapprovalDetails.getLocale();

        final ApplicationInfo appInfo = packageInfo.applicationInfo;

        boolean appLabelMatched = false;