From 8ade018f79521f150a7a688489836221e2458fea Mon Sep 17 00:00:00 2001 From: Mateus Azis Date: Wed, 21 Jun 2023 15:05:03 -0700 Subject: [PATCH] Make private, single-assignment fields "final" in android.content. Follow Google's internal best practices of marking fields final if there is no intention to reassign them. Test: m dist && acloud create --local-instance --local-image Change-Id: If6fd6c1c089fd2a704cbdf5c9db39597e460e496 --- .../java/android/content/pm/AppSearchShortcutInfo.java | 2 +- core/java/android/content/pm/ApplicationInfo.java | 4 ++-- core/java/android/content/pm/Attribution.java | 10 +++++----- .../java/android/content/pm/BaseParceledListSlice.java | 4 ++-- core/java/android/content/pm/CapabilityParams.java | 2 +- .../java/android/content/pm/IncrementalStatesInfo.java | 4 ++-- core/java/android/content/pm/KeySet.java | 2 +- core/java/android/content/pm/LauncherApps.java | 5 +++-- core/java/android/content/pm/PackageItemInfo.java | 2 +- core/java/android/content/pm/PermissionInfo.java | 3 ++- core/java/android/content/pm/ResolveInfo.java | 2 +- .../content/pm/parsing/result/ParseTypeImpl.java | 2 +- 12 files changed, 22 insertions(+), 20 deletions(-) diff --git a/core/java/android/content/pm/AppSearchShortcutInfo.java b/core/java/android/content/pm/AppSearchShortcutInfo.java index fb41b890ce9ca..225b3d3e18daa 100644 --- a/core/java/android/content/pm/AppSearchShortcutInfo.java +++ b/core/java/android/content/pm/AppSearchShortcutInfo.java @@ -445,7 +445,7 @@ public class AppSearchShortcutInfo extends GenericDocument { @VisibleForTesting public static class Builder extends GenericDocument.Builder { - private List mFlags = new ArrayList<>(1); + private final List mFlags = new ArrayList<>(1); public Builder(String packageName, String id) { super(/*namespace=*/ packageName, id, SCHEMA_TYPE); diff --git a/core/java/android/content/pm/ApplicationInfo.java b/core/java/android/content/pm/ApplicationInfo.java index bc3e25bfc7e87..5c1780c22f528 100644 --- a/core/java/android/content/pm/ApplicationInfo.java +++ b/core/java/android/content/pm/ApplicationInfo.java @@ -66,7 +66,7 @@ import java.util.UUID; * <application> 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); @@ -1862,7 +1862,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() { diff --git a/core/java/android/content/pm/Attribution.java b/core/java/android/content/pm/Attribution.java index 989a5b9ad1c2d..3649249853146 100644 --- a/core/java/android/content/pm/Attribution.java +++ b/core/java/android/content/pm/Attribution.java @@ -33,7 +33,7 @@ public final class Attribution implements Parcelable { /** * The tag of this attribution. From the <manifest> tag's "tag" attribute */ - private @NonNull String mTag; + private final @NonNull String mTag; /** * The resource ID of the label of the attribution From the <manifest> 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() {} diff --git a/core/java/android/content/pm/BaseParceledListSlice.java b/core/java/android/content/pm/BaseParceledListSlice.java index 1e0deffbf8cd4..03950fac758d9 100644 --- a/core/java/android/content/pm/BaseParceledListSlice.java +++ b/core/java/android/content/pm/BaseParceledListSlice.java @@ -41,8 +41,8 @@ import java.util.List; * @hide */ abstract class BaseParceledListSlice 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 diff --git a/core/java/android/content/pm/CapabilityParams.java b/core/java/android/content/pm/CapabilityParams.java index 7239bacf12215..60e8123b0029b 100644 --- a/core/java/android/content/pm/CapabilityParams.java +++ b/core/java/android/content/pm/CapabilityParams.java @@ -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 mAliases; diff --git a/core/java/android/content/pm/IncrementalStatesInfo.java b/core/java/android/content/pm/IncrementalStatesInfo.java index 0393d34ba988c..684e672c736b0 100644 --- a/core/java/android/content/pm/IncrementalStatesInfo.java +++ b/core/java/android/content/pm/IncrementalStatesInfo.java @@ -24,8 +24,8 @@ import android.os.Parcelable; * @hide */ public class IncrementalStatesInfo implements Parcelable { - private boolean mIsLoading; - private float mProgress; + private final boolean mIsLoading; + private final float mProgress; public IncrementalStatesInfo(boolean isLoading, float progress) { mIsLoading = isLoading; diff --git a/core/java/android/content/pm/KeySet.java b/core/java/android/content/pm/KeySet.java index fd459e662845c..3da5bfff76fcc 100644 --- a/core/java/android/content/pm/KeySet.java +++ b/core/java/android/content/pm/KeySet.java @@ -29,7 +29,7 @@ import android.os.Parcelable; */ public class KeySet implements Parcelable { - private IBinder token; + private final IBinder token; /** @hide */ public KeySet(IBinder token) { diff --git a/core/java/android/content/pm/LauncherApps.java b/core/java/android/content/pm/LauncherApps.java index 364aa90ef5867..7f169d48bf12f 100644 --- a/core/java/android/content/pm/LauncherApps.java +++ b/core/java/android/content/pm/LauncherApps.java @@ -1680,7 +1680,8 @@ public class LauncherApps { mCallbacks.add(toAdd); } - private IOnAppsChangedListener.Stub mAppsChangedListener = new IOnAppsChangedListener.Stub() { + private final IOnAppsChangedListener.Stub mAppsChangedListener = + new IOnAppsChangedListener.Stub() { @Override public void onPackageRemoved(UserHandle user, String packageName) @@ -1815,7 +1816,7 @@ public class LauncherApps { private static final int MSG_SHORTCUT_CHANGED = 8; private static final int MSG_LOADING_PROGRESS_CHANGED = 9; - private LauncherApps.Callback mCallback; + private final LauncherApps.Callback mCallback; private static class CallbackInfo { String[] packageNames; diff --git a/core/java/android/content/pm/PackageItemInfo.java b/core/java/android/content/pm/PackageItemInfo.java index 2bac066ed1867..bb978e05dd169 100644 --- a/core/java/android/content/pm/PackageItemInfo.java +++ b/core/java/android/content/pm/PackageItemInfo.java @@ -502,6 +502,6 @@ public class PackageItemInfo { } private final Collator sCollator = Collator.getInstance(); - private PackageManager mPM; + private final PackageManager mPM; } } diff --git a/core/java/android/content/pm/PermissionInfo.java b/core/java/android/content/pm/PermissionInfo.java index bb88486a014d9..7c5cca526b6e9 100644 --- a/core/java/android/content/pm/PermissionInfo.java +++ b/core/java/android/content/pm/PermissionInfo.java @@ -477,7 +477,8 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable { */ public @Nullable CharSequence nonLocalizedDescription; - private static ForStringSet sForStringSet = Parcelling.Cache.getOrCreate(ForStringSet.class); + private static final ForStringSet sForStringSet = + Parcelling.Cache.getOrCreate(ForStringSet.class); /** * A {@link Set} of trusted signing certificate digests. If this permission has the {@link diff --git a/core/java/android/content/pm/ResolveInfo.java b/core/java/android/content/pm/ResolveInfo.java index 6f07dd7a24e82..a7db03049b711 100644 --- a/core/java/android/content/pm/ResolveInfo.java +++ b/core/java/android/content/pm/ResolveInfo.java @@ -558,6 +558,6 @@ public class ResolveInfo implements Parcelable { } private final Collator mCollator = Collator.getInstance(); - private PackageManager mPM; + private final PackageManager mPM; } } diff --git a/core/java/android/content/pm/parsing/result/ParseTypeImpl.java b/core/java/android/content/pm/parsing/result/ParseTypeImpl.java index c32370441e970..8343c9213e196 100644 --- a/core/java/android/content/pm/parsing/result/ParseTypeImpl.java +++ b/core/java/android/content/pm/parsing/result/ParseTypeImpl.java @@ -41,7 +41,7 @@ public class ParseTypeImpl implements ParseInput, ParseResult { public static final boolean DEBUG_THROW_ALL_ERRORS = false; @NonNull - private Callback mCallback; + private final Callback mCallback; private Object mResult;