diff options
| author | Kenny Root <kroot@google.com> | 2010-07-30 16:55:37 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-07-30 16:55:37 -0700 |
| commit | 8b61b68b648985df37197de204398f608c4ad8b1 (patch) | |
| tree | 3060ed71f863619d629b9d3a95f7ca44a40de980 | |
| parent | d2165cfce7911dac66d1195ed9123e79b086d22b (diff) | |
| parent | 6f89fa07b4105b2e0cfac87db7ce5e7c9b9feead (diff) | |
| download | frameworks_base-8b61b68b648985df37197de204398f608c4ad8b1.zip frameworks_base-8b61b68b648985df37197de204398f608c4ad8b1.tar.gz frameworks_base-8b61b68b648985df37197de204398f608c4ad8b1.tar.bz2 | |
Merge "Only install after MCS success" into gingerbread
| -rw-r--r-- | services/java/com/android/server/PackageManagerService.java | 7 |
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 |