Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '437db6106b20d5a81f12a93593b5f623b3159f19':
  [ActivityManager] Do not add service to reschedule after removing users.
This commit is contained in:
Olawale Ogunwale
2015-04-07 03:55:38 +00:00
committed by Android Git Automerger
parent 283e5ce37b 437db6106b
commit 43293fa800
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/am/ActiveServices.java
View File

@@ -2228,7 +2228,7 @@ public final class ActiveServices {
EventLog.writeEvent(EventLogTags.AM_SERVICE_CRASHED_TOO_MUCH, EventLog.writeEvent(EventLogTags.AM_SERVICE_CRASHED_TOO_MUCH,
sr.userId, sr.crashCount, sr.shortName, app.pid); sr.userId, sr.crashCount, sr.shortName, app.pid);
bringDownServiceLocked(sr); bringDownServiceLocked(sr);
} else if (!allowRestart) { } else if (!allowRestart || !mAm.isUserRunningLocked(sr.userId, false)) {
bringDownServiceLocked(sr); bringDownServiceLocked(sr);
} else { } else {
boolean canceled = scheduleServiceRestartLocked(sr, true); boolean canceled = scheduleServiceRestartLocked(sr, true);