Merge "Guard against NPE when using existing process." into klp-dev

2013-10-10 17:17:14 +00:00
parent 6f71ed5b58 2ffa50df6f
commit 635892fe35
1 changed files with 1 additions and 1 deletions
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -7555,7 +7555,7 @@ public final class ActivityManagerService extends ActivityManagerNative
                        // Use existing process if already started
                        ProcessRecord proc = getProcessRecordLocked(
                                cpi.processName, cpr.appInfo.uid, false);
-                        if (proc != null) {
+                        if (proc != null && proc.thread != null) {
                            if (DEBUG_PROVIDER) {
                                Slog.d(TAG, "Installing in existing process " + proc);
                            }