commit d4e5725d457cf64efd06cfdae66c2ba68441fdac
author Tim Murray <timmurray@google.com> Wed Apr 18 10:09:58 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Apr 18 10:09:58 2018 -0700
tree 0e5b3443ef53c98a70ff6381da1500742b4e0faa
parent 23f45739c7326470e76e5028c3569b329e6eaf4f
parent efff5fcb8ecd486f2ffb96954ca1357f9a1509a7

Merge "ActivityManagerService: make bluetooth actually persistent" into pi-dev am: 89b1a4ee0f
am: efff5fcb8e

Change-Id: I746939ec543ef1d13bbb8dbbdb1422554736d91d

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

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 5135470..9d8509b 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -23389,8 +23389,14 @@
                                 int newAdj;
                                 if ((cr.flags&(Context.BIND_ABOVE_CLIENT
                                         |Context.BIND_IMPORTANT)) != 0) {
-                                    newAdj = clientAdj >= ProcessList.PERSISTENT_SERVICE_ADJ
-                                            ? clientAdj : ProcessList.PERSISTENT_SERVICE_ADJ;
+                                    if (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
                                         && clientAdj < ProcessList.PERCEPTIBLE_APP_ADJ
                                         && adj > ProcessList.PERCEPTIBLE_APP_ADJ) {