Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit 'b6e1ec19dd73cb55baef538a9119bcac0f8b9366' into kraken

* commit 'b6e1ec19dd73cb55baef538a9119bcac0f8b9366':
  Fix issue #2676378: Activity Manager Crash on FRF40
This commit is contained in:
Dianne Hackborn
2010-05-12 07:56:19 -07:00
committed by Android Git Automerger
parent 856f0bad16 b6e1ec19dd
commit bf00233b88
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/java/com/android/server/am/ActivityManagerService.java
View File

@@ -7858,18 +7858,18 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
r.conProviders.put(cpr, new Integer(cnt.intValue()+1)); r.conProviders.put(cpr, new Integer(cnt.intValue()+1));
} }
cpr.clients.add(r); cpr.clients.add(r);
} else { if (cpr.app != null && r.setAdj >= VISIBLE_APP_ADJ) {
cpr.externals++;
}
if (cpr.app != null) {
if (r.setAdj >= VISIBLE_APP_ADJ) {
// If this is a visible app accessing the provider, // If this is a visible app accessing the provider,
// make sure to count it as being accessed and thus // make sure to count it as being accessed and thus
// back up on the LRU list. This is good because // back up on the LRU list. This is good because
// content providers are often expensive to start. // content providers are often expensive to start.
updateLruProcessLocked(cpr.app, false, true); updateLruProcessLocked(cpr.app, false, true);
} }
} else {
cpr.externals++;
}
if (cpr.app != null) {
updateOomAdjLocked(cpr.app); updateOomAdjLocked(cpr.app);
} }