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

am 35786c34: Merge "Allow bound processes to go PROCESS_STATE_TOP." into klp-dev

Browse Source 
* commit '35786c3415d6446c1c84891bd589a7c75693cf2e':
  Allow bound processes to go PROCESS_STATE_TOP.
This commit is contained in:
Dianne Hackborn
2013-08-09 17:31:30 -07:00
committed by Android Git Automerger
parent c70629f137 35786c3415
commit 8e4e7a20f3
1 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13830,7 +13830,7 @@ public final class ActivityManagerService extends ActivityManagerNative
for (int is = app.services.size()-1;
is >= 0 && (adj > ProcessList.FOREGROUND_APP_ADJ
|| schedGroup == Process.THREAD_GROUP_BG_NONINTERACTIVE
|| procState > ActivityManager.PROCESS_STATE_IMPORTANT_FOREGROUND);
|| procState > ActivityManager.PROCESS_STATE_TOP);
is--) {
ServiceRecord s = app.services.valueAt(is);
if (s.startRequested) {
@@ -13871,13 +13871,13 @@ public final class ActivityManagerService extends ActivityManagerNative
for (int conni = s.connections.size()-1;
conni >= 0 && (adj > ProcessList.FOREGROUND_APP_ADJ
|| schedGroup == Process.THREAD_GROUP_BG_NONINTERACTIVE
|| procState > ActivityManager.PROCESS_STATE_IMPORTANT_FOREGROUND);
|| procState > ActivityManager.PROCESS_STATE_TOP);
conni--) {
ArrayList<ConnectionRecord> clist = s.connections.valueAt(conni);
for (int i = 0;
i < clist.size() && (adj > ProcessList.FOREGROUND_APP_ADJ
|| schedGroup == Process.THREAD_GROUP_BG_NONINTERACTIVE
|| procState > ActivityManager.PROCESS_STATE_IMPORTANT_FOREGROUND);
|| procState > ActivityManager.PROCESS_STATE_TOP);
i++) {
// XXX should compute this based on the max of
// all connected clients.
@@ -13987,8 +13987,16 @@ public final class ActivityManagerService extends ActivityManagerNative
if (client.curSchedGroup == Process.THREAD_GROUP_DEFAULT) {
schedGroup = Process.THREAD_GROUP_DEFAULT;
}
if (clientProcState <
ActivityManager.PROCESS_STATE_IMPORTANT_FOREGROUND) {
if (clientProcState <=
ActivityManager.PROCESS_STATE_PERSISTENT_UI &&
clientProcState >=
ActivityManager.PROCESS_STATE_PERSISTENT) {
// Persistent processes don't allow us to become top.
// However the top process DOES allow us to become top,
// because in that case we are running because the current
// top process wants us, so we should be counted as part
// of the top set and not just running for some random
// unknown reason in the background.
clientProcState =
ActivityManager.PROCESS_STATE_IMPORTANT_FOREGROUND;
}
@@ -14040,13 +14048,13 @@ public final class ActivityManagerService extends ActivityManagerNative
for (int provi = app.pubProviders.size()-1;
provi >= 0 && (adj > ProcessList.FOREGROUND_APP_ADJ
|| schedGroup == Process.THREAD_GROUP_BG_NONINTERACTIVE
|| procState > ActivityManager.PROCESS_STATE_IMPORTANT_FOREGROUND);
|| procState > ActivityManager.PROCESS_STATE_TOP);
provi--) {
ContentProviderRecord cpr = app.pubProviders.valueAt(provi);
for (int i = cpr.connections.size()-1;
i >= 0 && (adj > ProcessList.FOREGROUND_APP_ADJ
|| schedGroup == Process.THREAD_GROUP_BG_NONINTERACTIVE
|| procState > ActivityManager.PROCESS_STATE_IMPORTANT_FOREGROUND);
|| procState > ActivityManager.PROCESS_STATE_TOP);
i--) {
ContentProviderConnection conn = cpr.connections.get(i);
ProcessRecord client = conn.client;
@@ -14078,9 +14086,21 @@ public final class ActivityManagerService extends ActivityManagerNative
app.adjSourceOom = clientAdj;
app.adjTarget = cpr.name;
}
if (clientProcState <=
ActivityManager.PROCESS_STATE_PERSISTENT_UI &&
clientProcState >=
ActivityManager.PROCESS_STATE_PERSISTENT) {
// Persistent processes don't allow us to become top.
// However the top process DOES allow us to become top,
// because in that case we are running because the current
// top process wants us, so we should be counted as part
// of the top set and not just running for some random
// unknown reason in the background.
clientProcState =
ActivityManager.PROCESS_STATE_IMPORTANT_FOREGROUND;
}
if (procState > clientProcState) {
procState = clientProcState > ActivityManager.PROCESS_STATE_IMPORTANT_FOREGROUND
? clientProcState : ActivityManager.PROCESS_STATE_IMPORTANT_FOREGROUND;
procState = clientProcState;
}
if (client.curSchedGroup == Process.THREAD_GROUP_DEFAULT) {
schedGroup = Process.THREAD_GROUP_DEFAULT;