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

Commit de542dfb authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Make private, single-assignment fields "final" in android.content." am:... 

Merge "Make private, single-assignment fields "final" in android.content." am: 1614089e am: 028bbee5 am: d5f67632 am: 5f97e1c4 am: 51799384

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



Change-Id: Ifbf6ba871c8a20646e3cf40ab6ecb9d034c13abb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 20a60f3c 51799384

core/java/android/content/pm/AppSearchShortcutInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -445,7 +445,7 @@ public class AppSearchShortcutInfo extends GenericDocument { 
    @VisibleForTesting

    public static class Builder extends GenericDocument.Builder<Builder> {



        private List<String> mFlags = new ArrayList<>(1);

        private final List<String> mFlags = new ArrayList<>(1);



        public Builder(String packageName, String id) {

            super(/*namespace=*/ packageName, id, SCHEMA_TYPE);

core/java/android/content/pm/ApplicationInfo.java

+2 −2
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ import java.util.UUID; 
 * &lt;application&gt; tag.

 */

public class ApplicationInfo extends PackageItemInfo implements Parcelable {

    private static ForBoolean sForBoolean = Parcelling.Cache.getOrCreate(ForBoolean.class);

    private static final ForBoolean sForBoolean = Parcelling.Cache.getOrCreate(ForBoolean.class);

    private static final Parcelling.BuiltIn.ForStringSet sForStringSet =

            Parcelling.Cache.getOrCreate(Parcelling.BuiltIn.ForStringSet.class);
@@ -1892,7 +1892,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)

        private final Collator   sCollator = Collator.getInstance();

        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)

        private PackageManager   mPM;

        private final PackageManager mPM;

    }



    public ApplicationInfo() {

core/java/android/content/pm/Attribution.java

+5 −5
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ public final class Attribution implements Parcelable { 
    /**

     * The tag of this attribution. From the &lt;manifest&gt; tag's "tag" attribute

     */

    private @NonNull String mTag;

    private final @NonNull String mTag;



    /**

     * The resource ID of the label of the attribution From the &lt;manifest&gt; tag's "label"
@@ -43,7 +43,7 @@ public final class Attribution implements Parcelable { 






    // Code below generated by codegen v1.0.22.

    // Code below generated by codegen v1.0.23.

    //

    // DO NOT MODIFY!

    // CHECKSTYLE:OFF Generated code
@@ -146,10 +146,10 @@ public final class Attribution implements Parcelable { 
    };



    @DataClass.Generated(

            time = 1608139558081L,

            codegenVersion = "1.0.22",

            time = 1683311736586L,

            codegenVersion = "1.0.23",

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

            inputSignatures = "private @android.annotation.NonNull java.lang.String mTag\nprivate final @android.annotation.IdRes int mLabel\nclass Attribution extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genHiddenConstructor=true)")

            inputSignatures = "private final @android.annotation.NonNull java.lang.String mTag\nprivate final @android.annotation.IdRes int mLabel\nclass Attribution extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genHiddenConstructor=true)")

    @Deprecated

    private void __metadata() {}

core/java/android/content/pm/BaseParceledListSlice.java

+2 −2
Original line number Diff line number Diff line
@@ -42,8 +42,8 @@ import java.util.List; 
 * @hide

 */

abstract class BaseParceledListSlice<T> implements Parcelable {

    private static String TAG = "ParceledListSlice";

    private static boolean DEBUG = false;

    private static final String TAG = "ParceledListSlice";

    private static final boolean DEBUG = false;



    /*

     * TODO get this number from somewhere else. For now set it to a quarter of

core/java/android/content/pm/CapabilityParams.java

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ public final class CapabilityParams implements Parcelable { 
        @NonNull

        private final String mKey;

        @NonNull

        private String mPrimaryValue;

        private final String mPrimaryValue;

        @NonNull

        private Set<String> mAliases;