am b6e1ec19: am 037cd341: Merge "Fix issue #2676378: Activity Manager Crash on FRF40" into froyo

Merge commit 'b6e1ec19dd73cb55baef538a9119bcac0f8b9366' into kraken

* commit 'b6e1ec19dd73cb55baef538a9119bcac0f8b9366':
  Fix issue #2676378: Activity Manager Crash on FRF40

1 files changed, 6 insertions, 6 deletions

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 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
                         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);
                 }