Merge "Installer: Fix two small bugs." (3450ba84) · Commits · e / os / android_packages_apps_PackageInstaller

src/com/android/packageinstaller/EventResultPersister.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -252,8 +252,7 @@ class EventResultPersister {
		boolean stateChanged = false;

		synchronized (mLock) {
		int resultIndex = 0;
		EventResult result = null;
		int resultIndex = -1;

		if (id == GENERATE_NEW_ID) {
		if (mCounter == Integer.MAX_VALUE) {
		@@ -266,11 +265,12 @@ class EventResultPersister {
		}
		} else {
		resultIndex = mResults.indexOfKey(id);
		result = mResults.valueAt(resultIndex);
		}

		// Check if we can instantly call back
		if (result != null) {
		if (resultIndex >= 0) {
		EventResult result = mResults.valueAt(resultIndex);

		observer.onResult(result.status, result.message);
		mResults.removeAt(resultIndex);
		stateChanged = true;

+1 −1

Original line number	Diff line number	Diff line
		@@ -214,7 +214,7 @@ public class InstallInstalling extends Activity {
		PackageInstaller installer = getPackageManager().getPackageInstaller();
		PackageInstaller.SessionInfo sessionInfo = installer.getSessionInfo(mSessionId);

		if (!sessionInfo.isActive()) {
		if (sessionInfo != null && !sessionInfo.isActive()) {
		mInstallingTask = new InstallingAsyncTask();
		mInstallingTask.execute();
		} else {