Merge "[ActivityManager] Do not add service to reschedule after removing users."

2015-04-07 03:36:29 +00:00
parent 7200f661c1 cd005ebf76
commit 437db6106b
1 changed files with 1 additions and 1 deletions
--- 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);