Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit efff5fcb authored by Tim Murray's avatar Tim Murray Committed by android-build-merger
Browse files

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

am: 89b1a4ee

Change-Id: I9b8683effd9efccc7eb222e471d466bb529f451c
parents 86e2a2ab 89b1a4ee

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

+8 −2
Original line number Diff line number Diff line
@@ -23389,8 +23389,14 @@ public class ActivityManagerService extends IActivityManager.Stub 
                                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) {