diff options
| author | Kenny Root <kroot@google.com> | 2010-07-30 17:00:01 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-30 17:00:01 -0700 |
| commit | 9117669c7de41799535dfa88e5d68a30d7674733 (patch) | |
| tree | ac567180c7e57c1b8527491f9826300ba2f295cc | |
| parent | e2d33bbc496192d49c1e48baad446d8d0720d301 (diff) | |
| parent | 8b61b68b648985df37197de204398f608c4ad8b1 (diff) | |
| download | frameworks_base-9117669c7de41799535dfa88e5d68a30d7674733.zip frameworks_base-9117669c7de41799535dfa88e5d68a30d7674733.tar.gz frameworks_base-9117669c7de41799535dfa88e5d68a30d7674733.tar.bz2 | |
am 8b61b68b: Merge "Only install after MCS success" into gingerbread
Merge commit '8b61b68b648985df37197de204398f608c4ad8b1' into gingerbread-plus-aosp
* commit '8b61b68b648985df37197de204398f608c4ad8b1':
Only install after MCS success
| -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 |