From 3612487d618df84530645c45c7c3979383b39c12 Mon Sep 17 00:00:00 2001
From: Dianne Hackborn <hackbod@google.com>
Date: Thu, 8 Oct 2009 16:22:03 -0700
Subject: [PATCH] Fix issue #2174566: HOT STABILITY: NPE in activity manager

- Don't crash if the service's app process doesn't have a thread (this
  can happen if we are currently starting the process and then try to
  start the service again).
- Be more robust about deciding to start a service's process: try each
  time it is started; the startProcess call will take care of ignoring
  it if the process is already started.
- Fix some issues where we would leave dead processes on the low memory
  list.

Change-Id: I490e01ba7b45adc191bab7ace377b6873e284897
---
 .../server/am/ActivityManagerService.java     | 30 +++++++++++--------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
index c611795f79a27..3460d3ac98a30 100644
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -4556,7 +4556,7 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
                     long now = SystemClock.uptimeMillis();
                     for (i=0; i<count; i++) {
                         ProcessRecord rec = mLRUProcesses.get(i);
-                        if (rec.thread != null &&
+                        if (rec != app && rec.thread != null &&
                                 (rec.lastLowMemory+GC_MIN_INTERVAL) <= now) {
                             // The low memory report is overriding any current
                             // state for a GC request.  Make sure to do
@@ -9852,6 +9852,8 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
             mLRUProcesses.remove(index);
         }
 
+        mProcessesToGc.remove(app);
+        
         // Dismiss any open dialogs.
         if (app.crashDialog != null) {
             app.crashDialog.dismiss();
@@ -10519,7 +10521,7 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
         //Log.i(TAG, "Bring up service:");
         //r.dump("  ");
 
-        if (r.app != null) {
+        if (r.app != null && r.app.thread != null) {
             sendServiceArgsLocked(r, false);
             return true;
         }
@@ -10550,20 +10552,22 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
             // restart the application.
         }
 
+        // Not running -- get it started, and enqueue this service record
+        // to be executed when the app comes up.
+        if (startProcessLocked(appName, r.appInfo, true, intentFlags,
+                "service", r.name, false) == null) {
+            Log.w(TAG, "Unable to launch app "
+                    + r.appInfo.packageName + "/"
+                    + r.appInfo.uid + " for service "
+                    + r.intent.getIntent() + ": process is bad");
+            bringDownServiceLocked(r, true);
+            return false;
+        }
+        
         if (!mPendingServices.contains(r)) {
-            // Not running -- get it started, and enqueue this service record
-            // to be executed when the app comes up.
-            if (startProcessLocked(appName, r.appInfo, true, intentFlags,
-                    "service", r.name, false) == null) {
-                Log.w(TAG, "Unable to launch app "
-                        + r.appInfo.packageName + "/"
-                        + r.appInfo.uid + " for service "
-                        + r.intent.getIntent() + ": process is bad");
-                bringDownServiceLocked(r, true);
-                return false;
-            }
             mPendingServices.add(r);
         }
+        
         return true;
     }