Merge "Remove dry run flag and its use" (ac0b4868) · Commits · e / os / android_frameworks_base

core/java/android/content/pm/PackageManager.java

+0 −9

Original line number	Diff line number	Diff line
		@@ -788,7 +788,6 @@ public abstract class PackageManager {
		INSTALL_ENABLE_ROLLBACK,
		INSTALL_ALLOW_DOWNGRADE,
		INSTALL_STAGED,
		INSTALL_DRY_RUN,
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface InstallFlags {}
		@@ -966,14 +965,6 @@ public abstract class PackageManager {
		*/
		public static final int INSTALL_STAGED = 0x00200000;

		/**
		* Flag parameter for {@link #installPackage} to indicate that package should only be verified
		* but not installed.
		*
		* @hide
		*/
		public static final int INSTALL_DRY_RUN = 0x00800000;

		/** @hide */
		@IntDef(flag = true, value = {
		DONT_KILL_APP,

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

+10 −22

Original line number	Diff line number	Diff line
		@@ -743,9 +743,8 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements
		mStagingManager.createSession(session);
		}

		if ((session.params.installFlags & PackageManager.INSTALL_DRY_RUN) == 0) {
		mCallbacks.notifySessionCreated(session.sessionId, session.userId);
		}

		writeSessionsAsync();
		return sessionId;
		}
		@@ -1355,26 +1354,19 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements

		class InternalCallback {
		public void onSessionBadgingChanged(PackageInstallerSession session) {
		if ((session.params.installFlags & PackageManager.INSTALL_DRY_RUN) == 0) {
		mCallbacks.notifySessionBadgingChanged(session.sessionId, session.userId);
		}

		writeSessionsAsync();
		}

		public void onSessionActiveChanged(PackageInstallerSession session, boolean active) {
		if ((session.params.installFlags & PackageManager.INSTALL_DRY_RUN) == 0) {
		mCallbacks.notifySessionActiveChanged(session.sessionId, session.userId,
		active);
		}
		}

		public void onSessionProgressChanged(PackageInstallerSession session, float progress) {
		if ((session.params.installFlags & PackageManager.INSTALL_DRY_RUN) == 0) {
		mCallbacks.notifySessionProgressChanged(session.sessionId, session.userId,
		progress);
		}
		}

		public void onStagedSessionChanged(PackageInstallerSession session) {
		session.markUpdated();
		@@ -1389,18 +1381,14 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements
		}

		public void onSessionFinished(final PackageInstallerSession session, boolean success) {
		if ((session.params.installFlags & PackageManager.INSTALL_DRY_RUN) == 0) {
		mCallbacks.notifySessionFinished(session.sessionId, session.userId, success);
		}

		mInstallHandler.post(new Runnable() {
		@Override
		public void run() {
		if (session.isStaged()) {
		if (!success) {
		if (session.isStaged() && !success) {
		mStagingManager.abortSession(session);
		}
		}
		synchronized (mSessions) {
		if (!session.isStaged() \|\| !success) {
		mSessions.remove(session.sessionId);

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -3306,8 +3306,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
		// Send broadcast to default launcher only if it's a new install
		// TODO(b/144270665): Secure the usage of this broadcast.
		final boolean isNewInstall = extras == null \|\| !extras.getBoolean(Intent.EXTRA_REPLACING);
		if (success && isNewInstall && mPm.mInstallerService.okToSendBroadcasts()
		&& (params.installFlags & PackageManager.INSTALL_DRY_RUN) == 0) {
		if (success && isNewInstall && mPm.mInstallerService.okToSendBroadcasts()) {
		mPm.sendSessionCommitBroadcast(generateInfoScrubbed(true /icon/), userId);
		}