Merge "Only install after MCS success" into gingerbread

2010-07-30 16:55:37 -07:00
parent d2165cfce7 6f89fa07b4
commit 8b61b68b64
1 changed files with 6 additions and 1 deletions
--- 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