diff options
| author | Olawale Ogunwale <ogunwale@google.com> | 2015-04-07 04:15:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-07 04:15:58 +0000 |
| commit | 94efe9172e4797fab1ab470d298cb62b7cd3ebe8 (patch) | |
| tree | 6eb29db25470b7adb6080201cf25eaf585d8f3bd | |
| parent | 78485e0fd11e2e06f1f2a95f7d693f8d3fff53a1 (diff) | |
| parent | bf39a6c6605764100a29f96c69bca6fb6f907fc3 (diff) | |
| download | frameworks_base-94efe9172e4797fab1ab470d298cb62b7cd3ebe8.zip frameworks_base-94efe9172e4797fab1ab470d298cb62b7cd3ebe8.tar.gz frameworks_base-94efe9172e4797fab1ab470d298cb62b7cd3ebe8.tar.bz2 | |
am bf39a6c6: am 43293fa8: am 437db610: Merge "[ActivityManager] Do not add service to reschedule after removing users."
* commit 'bf39a6c6605764100a29f96c69bca6fb6f907fc3':
[ActivityManager] Do not add service to reschedule after removing users.
| -rwxr-xr-x | services/core/java/com/android/server/am/ActiveServices.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java index 4fa0577..e92443c 100755 --- a/services/core/java/com/android/server/am/ActiveServices.java +++ b/services/core/java/com/android/server/am/ActiveServices.java @@ -2294,7 +2294,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); |