summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2010-07-30 16:33:47 -0700
committerKenny Root <kroot@google.com>2010-07-30 16:35:04 -0700
commit6f89fa07b4105b2e0cfac87db7ce5e7c9b9feead (patch)
treeee8da2d3ed9867716b4f44526074b868cff3fe5d /services
parent7c600369c9695de73ca37db552eb81b8b89d5e76 (diff)
downloadframeworks_base-6f89fa07b4105b2e0cfac87db7ce5e7c9b9feead.zip
frameworks_base-6f89fa07b4105b2e0cfac87db7ce5e7c9b9feead.tar.gz
frameworks_base-6f89fa07b4105b2e0cfac87db7ce5e7c9b9feead.tar.bz2
Only install after MCS success
If MCS dies in the middle of a call during install, only proceed if the call was successful. Otherwise wait for the max retries to be reached and run the failure handling code there. Change-Id: I00a27ea91046ea6521a3cff5e5ffe2c71b2b5bb4
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/PackageManagerService.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/services/java/com/android/server/PackageManagerService.java b/services/java/com/android/server/PackageManagerService.java
index b29c6e6..ff4ff74 100644
--- a/services/java/com/android/server/PackageManagerService.java
+++ b/services/java/com/android/server/PackageManagerService.java
@@ -5019,7 +5019,12 @@ class PackageManagerService extends IPackageManager.Stub {
@Override
void handleReturnCode() {
- processPendingInstall(mArgs, mRet);
+ // If mArgs is null, then MCS couldn't be reached. When it
+ // reconnects, it will try again to install. At that point, this
+ // will succeed.
+ if (mArgs != null) {
+ processPendingInstall(mArgs, mRet);
+ }
}
@Override