Merge "Don't send SessionCallbacks for DRY_RUN sessions." into qt-dev (c121c124) · Commits · e / os / android_frameworks_base

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

+18 −5

Original line number	Diff line number	Diff line
		@@ -617,7 +617,9 @@ 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;
		}
		@@ -1210,16 +1212,25 @@ 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) {
		mCallbacks.notifySessionActiveChanged(session.sessionId, session.userId, active);
		if ((session.params.installFlags & PackageManager.INSTALL_DRY_RUN) == 0) {
		mCallbacks.notifySessionActiveChanged(session.sessionId, session.userId,
		active);
		}
		}

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

		public void onStagedSessionChanged(PackageInstallerSession session) {
		@@ -1232,7 +1243,9 @@ 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