diff options
| author | Olawale Ogunwale <ogunwale@google.com> | 2015-04-07 03:55:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-07 03:55:38 +0000 |
| commit | 43293fa800d3c7d93ce99bb937ceb7496da85ffa (patch) | |
| tree | 5373db7f7ae4be31a56118cd73f9d4e53abd8d21 /services | |
| parent | 283e5ce37ba3966f54d1a6d1a32a79da3a8ad0fd (diff) | |
| parent | 437db6106b20d5a81f12a93593b5f623b3159f19 (diff) | |
| download | frameworks_base-43293fa800d3c7d93ce99bb937ceb7496da85ffa.zip frameworks_base-43293fa800d3c7d93ce99bb937ceb7496da85ffa.tar.gz frameworks_base-43293fa800d3c7d93ce99bb937ceb7496da85ffa.tar.bz2 | |
am 437db610: Merge "[ActivityManager] Do not add service to reschedule after removing users."
* commit '437db6106b20d5a81f12a93593b5f623b3159f19':
[ActivityManager] Do not add service to reschedule after removing users.
Diffstat (limited to 'services')
| -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 a9d6a69..4e7aa77 100755 --- a/services/core/java/com/android/server/am/ActiveServices.java +++ b/services/core/java/com/android/server/am/ActiveServices.java @@ -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); |