From 2ffa50df6f8aa94951cd741cef478e9f9002d496 Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Thu, 10 Oct 2013 09:52:48 -0700
Subject: [PATCH] Guard against NPE when using existing process.

Bug: 11167561
Change-Id: I51ca7daa71504119fb64bc7bc2b7da4e03b13861
---
 services/java/com/android/server/am/ActivityManagerService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
index 6c6cc98396877..aae4cb890f99d 100644
--- 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);
                             }