Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I62262482d219b20cd15610fcfe191aa41c7a2990
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-06-22 01:03:07 +00:00
committed by Automerger Merge Worker
parent 29a0487249 1614089e5a
commit 028bbee57c
12 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/content/pm/AppSearchShortcutInfo.java
View File

@@ -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);

4
core/java/android/content/pm/ApplicationInfo.java
View File

@@ -66,7 +66,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);
@@ -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() {

10
core/java/android/content/pm/Attribution.java
View File

@@ -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() {}

4
core/java/android/content/pm/BaseParceledListSlice.java
View File

@@ -41,8 +41,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

2
core/java/android/content/pm/CapabilityParams.java
View File

@@ -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;

4
core/java/android/content/pm/IncrementalStatesInfo.java
View File

@@ -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;

2
core/java/android/content/pm/KeySet.java
View File

@@ -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) {

5
core/java/android/content/pm/LauncherApps.java
View File

@@ -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;

2
core/java/android/content/pm/PackageItemInfo.java
View File

@@ -502,6 +502,6 @@ public class PackageItemInfo {
}
private final Collator sCollator = Collator.getInstance();
private PackageManager mPM;
private final PackageManager mPM;
}
}

3
core/java/android/content/pm/PermissionInfo.java
View File

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

2
core/java/android/content/pm/ResolveInfo.java
View File

@@ -558,6 +558,6 @@ public class ResolveInfo implements Parcelable {
}
private final Collator mCollator = Collator.getInstance();
private PackageManager mPM;
private final PackageManager mPM;
}
}

2
core/java/android/content/pm/parsing/result/ParseTypeImpl.java
View File

@@ -41,7 +41,7 @@ public class ParseTypeImpl implements ParseInput, ParseResult<Object> {
public static final boolean DEBUG_THROW_ALL_ERRORS = false;
@NonNull
private Callback mCallback;
private final Callback mCallback;
private Object mResult;