am 9117669c: am 8b61b68b: Merge "Only install after MCS success" into gingerbread

Merge commit '9117669c7de41799535dfa88e5d68a30d7674733'

* commit '9117669c7de41799535dfa88e5d68a30d7674733':
  Only install after MCS success

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 7279e83c3b3a..7cc254b9f1c8 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