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

Merge "ActivityManagerService: make bluetooth actually persistent" into pi-dev

Browse Source 
am: 89b1a4ee0f

Change-Id: I9b8683effd9efccc7eb222e471d466bb529f451c
This commit is contained in:
Tim Murray
2018-04-18 10:00:26 -07:00
committed by android-build-merger
parent 86e2a2ab32 89b1a4ee0f
commit efff5fcb8e
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -23389,8 +23389,14 @@ public class ActivityManagerService extends IActivityManager.Stub
int newAdj; int newAdj;
if ((cr.flags&(Context.BIND_ABOVE_CLIENT if ((cr.flags&(Context.BIND_ABOVE_CLIENT
|Context.BIND_IMPORTANT)) != 0) { |Context.BIND_IMPORTANT)) != 0) {
newAdj = clientAdj >= ProcessList.PERSISTENT_SERVICE_ADJ if (clientAdj >= ProcessList.PERSISTENT_SERVICE_ADJ) {
? clientAdj : ProcessList.PERSISTENT_SERVICE_ADJ; newAdj = clientAdj;
} else {
// make this service persistent
newAdj = ProcessList.PERSISTENT_SERVICE_ADJ;
schedGroup = ProcessList.SCHED_GROUP_DEFAULT;
procState = ActivityManager.PROCESS_STATE_PERSISTENT;
}
} else if ((cr.flags&Context.BIND_NOT_VISIBLE) != 0 } else if ((cr.flags&Context.BIND_NOT_VISIBLE) != 0
&& clientAdj < ProcessList.PERCEPTIBLE_APP_ADJ && clientAdj < ProcessList.PERCEPTIBLE_APP_ADJ
&& adj > ProcessList.PERCEPTIBLE_APP_ADJ) { && adj > ProcessList.PERCEPTIBLE_APP_ADJ) {