Merge "Remove unused field from StagingManager" (849ed53e) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -205,7 +205,7 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements

		mApexManager = am;

		mStagingManager = new StagingManager(pm, this, am, context);
		mStagingManager = new StagingManager(this, am, context);
		}

		boolean okToSendBroadcasts() {

+1 −4

Original line number	Diff line number	Diff line
		@@ -69,7 +69,6 @@ public class StagingManager {
		private static final String TAG = "StagingManager";

		private final PackageInstallerService mPi;
		private final PackageManagerService mPm;
		private final ApexManager mApexManager;
		private final PowerManager mPowerManager;
		private final Handler mBgHandler;
		@@ -77,9 +76,7 @@ public class StagingManager {
		@GuardedBy("mStagedSessions")
		private final SparseArray<PackageInstallerSession> mStagedSessions = new SparseArray<>();

		StagingManager(PackageManagerService pm, PackageInstallerService pi, ApexManager am,
		Context context) {
		mPm = pm;
		StagingManager(PackageInstallerService pi, ApexManager am, Context context) {
		mPi = pi;
		mApexManager = am;
		mPowerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);