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

Commit bf39a6c6 authored by Olawale Ogunwale's avatar Olawale Ogunwale Committed by Android Git Automerger
Browse files

am 43293fa8: am 437db610: Merge "[ActivityManager] Do not add service to... 

am 43293fa8: am 437db610: Merge "[ActivityManager] Do not add service to reschedule after removing users."

* commit '43293fa8':
  [ActivityManager] Do not add service to reschedule after removing users.
parents ef2279a1 43293fa8

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

+1 −1
Original line number Diff line number Diff line
@@ -2228,7 +2228,7 @@ public final class ActiveServices { 
                EventLog.writeEvent(EventLogTags.AM_SERVICE_CRASHED_TOO_MUCH,

                        sr.userId, sr.crashCount, sr.shortName, app.pid);

                bringDownServiceLocked(sr);

            } else if (!allowRestart) {

            } else if (!allowRestart || !mAm.isUserRunningLocked(sr.userId, false)) {

                bringDownServiceLocked(sr);

            } else {

                boolean canceled = scheduleServiceRestartLocked(sr, true);