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

Commit 351713a2 authored by Mateus Azis's avatar Mateus Azis
Browse files

Inline/remove unnecessary instance fields from PM. 

Following the recommendations from go/tott/343. Many of these fields are
assigned in the constructor and never read afterwards.

In some cases, they weren't ever read, so I removed them altogether
(assuming their construction yields no side-effects).

Bug: 274764512
Test: "m dist" and started cuttlefish instance.
Change-Id: I6c2e96ce1b8e29ba700b334f9f32d3b1b5dbfbdd
parent 1ecc9b91

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

+3 −5
Original line number Diff line number Diff line
@@ -75,11 +75,9 @@ public class BackgroundInstallControlService extends SystemService { 
    private static final int MSG_PACKAGE_ADDED = 1;

    private static final int MSG_PACKAGE_REMOVED = 2;



    private final Context mContext;

    private final BinderService mBinderService;

    private final PackageManager mPackageManager;

    private final PackageManagerInternal mPackageManagerInternal;

    private final UsageStatsManagerInternal mUsageStatsManagerInternal;

    private final PermissionManagerServiceInternal mPermissionManager;

    private final Handler mHandler;

    private final File mDiskFile;
@@ -99,14 +97,14 @@ public class BackgroundInstallControlService extends SystemService { 
    @VisibleForTesting

    BackgroundInstallControlService(@NonNull Injector injector) {

        super(injector.getContext());

        mContext = injector.getContext();

        mPackageManager = injector.getPackageManager();

        mPackageManagerInternal = injector.getPackageManagerInternal();

        mPermissionManager = injector.getPermissionManager();

        mHandler = new EventHandler(injector.getLooper(), this);

        mDiskFile = injector.getDiskFile();

        mUsageStatsManagerInternal = injector.getUsageStatsManagerInternal();

        mUsageStatsManagerInternal.registerListener(

        UsageStatsManagerInternal usageStatsManagerInternal =

                injector.getUsageStatsManagerInternal();

        usageStatsManagerInternal.registerListener(

                (userId, event) ->

                        mHandler.obtainMessage(MSG_USAGE_EVENT_RECEIVED,

                                userId,

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

+3 −4
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ import java.util.List; 
public class DataLoaderManagerService extends SystemService {

    private static final String TAG = "DataLoaderManager";

    private final Context mContext;

    private final HandlerThread mThread;

    private final Handler mHandler;

    private final DataLoaderManagerBinderService mBinderService;

    private final SparseArray<DataLoaderServiceConnection> mServiceConnections =
@@ -57,10 +56,10 @@ public class DataLoaderManagerService extends SystemService { 
        super(context);

        mContext = context;



        mThread = new HandlerThread(TAG);

        mThread.start();

        HandlerThread thread = new HandlerThread(TAG);

        thread.start();



        mHandler = new Handler(mThread.getLooper());

        mHandler = new Handler(thread.getLooper());



        mBinderService = new DataLoaderManagerBinderService();

    }

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

+0 −5
Original line number Diff line number Diff line
@@ -107,9 +107,6 @@ public abstract class IPackageManagerBase extends IPackageManager.Stub { 
    @Nullable

    private final ComponentName mInstantAppResolverSettingsComponent;



    @NonNull

    private final String mRequiredSupplementalProcessPackage;



    @Nullable

    private final String mServicesExtensionPackageName;
@@ -125,7 +122,6 @@ public abstract class IPackageManagerBase extends IPackageManager.Stub { 
            @NonNull PackageInstallerService installerService,

            @NonNull PackageProperty packageProperty, @NonNull ComponentName resolveComponentName,

            @Nullable ComponentName instantAppResolverSettingsComponent,

            @NonNull String requiredSupplementalProcessPackage,

            @Nullable String servicesExtensionPackageName,

            @Nullable String sharedSystemSharedLibraryPackageName) {

        mService = service;
@@ -140,7 +136,6 @@ public abstract class IPackageManagerBase extends IPackageManager.Stub { 
        mPackageProperty = packageProperty;

        mResolveComponentName = resolveComponentName;

        mInstantAppResolverSettingsComponent = instantAppResolverSettingsComponent;

        mRequiredSupplementalProcessPackage = requiredSupplementalProcessPackage;

        mServicesExtensionPackageName = servicesExtensionPackageName;

        mSharedSystemSharedLibraryPackageName = sharedSystemSharedLibraryPackageName;

    }

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

+1 −2
Original line number Diff line number Diff line
@@ -4659,8 +4659,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService 
                    mPreferredActivityHelper, mResolveIntentHelper, mDomainVerificationManager,

                    mDomainVerificationConnection, mInstallerService, mPackageProperty,

                    mResolveComponentName, mInstantAppResolverSettingsComponent,

                    mRequiredSdkSandboxPackage, mServicesExtensionPackageName,

                    mSharedSystemSharedLibraryPackageName);

                    mServicesExtensionPackageName, mSharedSystemSharedLibraryPackageName);

        }



        @Override

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

+1 −4
Original line number Diff line number Diff line
@@ -57,11 +57,8 @@ public class ProtectedPackages { 
    @GuardedBy("this")

    private final SparseArray<Set<String>> mOwnerProtectedPackages = new SparseArray<>();



    private final Context mContext;



    public ProtectedPackages(Context context) {

        mContext = context;

        mDeviceProvisioningPackage = mContext.getResources().getString(

        mDeviceProvisioningPackage = context.getResources().getString(

                R.string.config_deviceProvisioningPackage);

    }