commit 6f86c0e64bcca300f650871c0a84456a7813432d
author Dianne Hackborn <hackbod@google.com> Tue May 11 14:20:52 2010 -0700
committer Dianne Hackborn <hackbod@google.com> Tue May 11 14:20:52 2010 -0700
tree 8047179fe69addfb0e1356a1cf25a7f1cf8485c9
parent e1d7dca608ced72c75bf906c7267a1ef30349826

Fix issue #2676378: Activity Manager Crash on FRF40

D'oh!

Change-Id: If1b43ff5f230f9bf0de0887deb1b25dcf6aa6e66

services/java/com/android/server/am/ActivityManagerService.java

diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
index 948d292..022eccf 100644
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -7858,18 +7858,18 @@
                         r.conProviders.put(cpr, new Integer(cnt.intValue()+1));
                     }
                     cpr.clients.add(r);
-                } else {
-                    cpr.externals++;
-                }
-
-                if (cpr.app != null) {
-                    if (r.setAdj >= VISIBLE_APP_ADJ) {
+                    if (cpr.app != null && r.setAdj >= VISIBLE_APP_ADJ) {
                         // If this is a visible app accessing the provider,
                         // make sure to count it as being accessed and thus
                         // back up on the LRU list.  This is good because
                         // content providers are often expensive to start.
                         updateLruProcessLocked(cpr.app, false, true);
                     }
+                } else {
+                    cpr.externals++;
+                }
+
+                if (cpr.app != null) {
                     updateOomAdjLocked(cpr.app);
                 }