Merge "Mark single-assignment fields in PM server as "final"." into main (1e03b984) · Commits · e / os / android_frameworks_base

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -410,7 +410,7 @@ public abstract class ApexManager {
		* Map of all apex system services to the jar files they are contained in.
		*/
		@GuardedBy("mLock")
		private List<ApexSystemServiceInfo> mApexSystemServices = new ArrayList<>();
		private final List<ApexSystemServiceInfo> mApexSystemServices = new ArrayList<>();

		/**
		* Contains the list of {@code packageName}s of apks-in-apex for given
		@@ -418,14 +418,14 @@ public abstract class ApexManager {
		* difference between {@code packageName} and {@code apexModuleName}.
		*/
		@GuardedBy("mLock")
		private ArrayMap<String, List<String>> mApksInApex = new ArrayMap<>();
		private final ArrayMap<String, List<String>> mApksInApex = new ArrayMap<>();

		/**
		* Contains the list of {@code Exception}s that were raised when installing apk-in-apex
		* inside {@code apexModuleName}.
		*/
		@GuardedBy("mLock")
		private Map<String, String> mErrorWithApkInApex = new ArrayMap<>();
		private final Map<String, String> mErrorWithApkInApex = new ArrayMap<>();

		/**
		* An APEX is a file format that delivers the apex-payload wrapped in an apk container. The

+1 −1

Original line number	Diff line number	Diff line
		@@ -201,7 +201,7 @@ public abstract class AppsFilterBase implements AppsFilterSnapshot {

		protected static final boolean CACHE_VALID = true;
		protected static final boolean CACHE_INVALID = false;
		protected AtomicBoolean mCacheValid = new AtomicBoolean(CACHE_INVALID);
		protected final AtomicBoolean mCacheValid = new AtomicBoolean(CACHE_INVALID);

		protected boolean isForceQueryable(int callingAppId) {
		return mForceQueryable.contains(callingAppId);

+2 −2

Original line number	Diff line number	Diff line
		@@ -89,7 +89,7 @@ public final class BackgroundDexOptService {

		private static final long CANCELLATION_WAIT_CHECK_INTERVAL_MS = 200;

		private static ComponentName sDexoptServiceName =
		private static final ComponentName sDexoptServiceName =
		new ComponentName("android", BackgroundDexOptJobService.class.getName());

		// Possible return codes of individual optimization steps.
		@@ -179,7 +179,7 @@ public final class BackgroundDexOptService {

		private final long mDowngradeUnusedAppsThresholdInMillis;

		private List<PackagesUpdatedListener> mPackagesUpdatedListeners = new ArrayList<>();
		private final List<PackagesUpdatedListener> mPackagesUpdatedListeners = new ArrayList<>();

		private int mThermalStatusCutoff = THERMAL_CUTOFF_DEFAULT;

+1 −1

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@ import android.content.pm.CrossProfileAppsInternal;
		import com.android.server.SystemService;

		public class CrossProfileAppsService extends SystemService {
		private CrossProfileAppsServiceImpl mServiceImpl;
		private final CrossProfileAppsServiceImpl mServiceImpl;

		public CrossProfileAppsService(Context context) {
		super(context);

+3 −3

Original line number	Diff line number	Diff line
		@@ -78,8 +78,8 @@ public class CrossProfileAppsServiceImpl extends ICrossProfileApps.Stub {

		private final LocalService mLocalService = new LocalService();

		private Context mContext;
		private Injector mInjector;
		private final Context mContext;
		private final Injector mInjector;

		public CrossProfileAppsServiceImpl(Context context) {
		this(context, new InjectorImpl(context));
		@@ -783,7 +783,7 @@ public class CrossProfileAppsServiceImpl extends ICrossProfileApps.Stub {
		}

		private static class InjectorImpl implements Injector {
		private Context mContext;
		private final Context mContext;

		public InjectorImpl(Context context) {
		mContext = context;