Merge "Remove DefaultContainerService usage in PackageManagerService." (37f3eae1) · Commits · e / os / android_frameworks_base

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

+1 −23

Original line number	Diff line number	Diff line
		@@ -59,6 +59,7 @@ import android.content.pm.PackageParser;
		import android.content.pm.PackageParser.ApkLite;
		import android.content.pm.PackageParser.PackageLite;
		import android.content.pm.PackageParser.PackageParserException;
		import android.content.pm.dex.DexMetadataHelper;
		import android.graphics.Bitmap;
		import android.graphics.BitmapFactory;
		import android.os.Binder;
		@@ -99,7 +100,6 @@ import com.android.server.LocalServices;
		import com.android.server.pm.Installer.InstallerException;
		import com.android.server.pm.PackageInstallerService.PackageInstallObserverAdapter;

		import android.content.pm.dex.DexMetadataHelper;
		import libcore.io.IoUtils;

		import org.xmlpull.v1.XmlPullParser;
		@@ -122,7 +122,6 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
		private static final boolean LOGD = true;
		private static final String REMOVE_SPLIT_MARKER_EXTENSION = ".removed";

		private static final int MSG_EARLY_BIND = 0;
		private static final int MSG_COMMIT = 1;
		private static final int MSG_ON_PACKAGE_INSTALLED = 2;

		@@ -168,7 +167,6 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
		final int userId;
		final SessionParams params;
		final long createdMillis;
		final int defaultContainerGid;

		/** Staging location where client data is written. */
		final File stageDir;
		@@ -285,9 +283,6 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
		@Override
		public boolean handleMessage(Message msg) {
		switch (msg.what) {
		case MSG_EARLY_BIND:
		earlyBindToDefContainer();
		break;
		case MSG_COMMIT:
		synchronized (mLock) {
		try {
		@@ -323,10 +318,6 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
		}
		};

		private void earlyBindToDefContainer() {
		mPm.earlyBindToDefContainer();
		}

		/**
		* @return {@code true} iff the installing is app an device owner or affiliated profile owner.
		*/
		@@ -413,19 +404,6 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
		}
		}
		}

		final long identity = Binder.clearCallingIdentity();
		try {
		final int uid = mPm.getPackageUid(PackageManagerService.DEFAULT_CONTAINER_PACKAGE,
		PackageManager.MATCH_SYSTEM_ONLY, UserHandle.USER_SYSTEM);
		defaultContainerGid = UserHandle.getSharedAppGid(uid);
		} finally {
		Binder.restoreCallingIdentity(identity);
		}
		// attempt to bind to the DefContainer as early as possible
		if ((params.installFlags & PackageManager.INSTALL_INSTANT_APP) != 0) {
		mHandler.sendMessage(mHandler.obtainMessage(MSG_EARLY_BIND));
		}
		}

		public SessionInfo generateInfo() {