summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Olawale Ogunwale <ogunwale@google.com> 2015-01-12 16:26:52 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-01-12 16:26:52 +0000
commitcacf55647f64076f840f37537a5edb979fe2c3ab (patch)
tree9dc9b85de3a7e00ef0f51c50ba9860d0cc8f5a82
parenta9ae505053585b6c46a6a86475959fd9fe501b09 (diff)
parente3f859854712e96daf38d88b260afa8ac67a4e32 (diff)
am e3f85985: Merge "bindService can\'t start up service process"
* commit 'e3f859854712e96daf38d88b260afa8ac67a4e32': bindService can't start up service process
-rwxr-xr-xservices/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 f02a815833ca..05403261c31e 100755
--- a/services/core/java/com/android/server/am/ActiveServices.java
+++ b/services/core/java/com/android/server/am/ActiveServices.java
@@ -1322,6 +1322,7 @@ public final class ActiveServices {
// We are now bringing the service up, so no longer in the
// restarting state.
if (mRestartingServices.remove(r)) {
+ r.resetRestartCounter();
clearRestartingIfNeededLocked(r);
}