summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Craig Mautner <cmautner@google.com> 2014-02-19 16:37:07 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-02-19 16:37:07 +0000
commit08c9db7363a45e2e86f3f69f52758c37775cea7e (patch)
tree2d2eb98d3584660e8bf013f0130711879cfd6475
parentdfc1ef92557be5565469a2fc8b075f46dc3b4948 (diff)
parent6ed1c96b7253d2590ffe339714bdcaf8c77217c0 (diff)
am 6ed1c96b: am a1baf028: am 23ef1b5e: am 16ea3e6a: Merge "A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one."
* commit '6ed1c96b7253d2590ffe339714bdcaf8c77217c0': A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one.
-rwxr-xr-x[-rw-r--r--]services/core/java/com/android/server/am/ActiveServices.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java
index be2df04dd20f..a84512723a8b 100644..100755
--- a/services/core/java/com/android/server/am/ActiveServices.java
+++ b/services/core/java/com/android/server/am/ActiveServices.java
@@ -204,6 +204,7 @@ public final class ActiveServices {
Slog.i(TAG, "Waited long enough for: " + r);
mStartingBackground.remove(i);
N--;
+ i--;
}
}
while (mDelayedStartList.size() > 0