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

Merge "Don't clear restart counter when bringing up the service." into oc-dev

Browse Source
This commit is contained in:
Sudheer Shanka
2017-04-22 01:31:18 +00:00
committed by Android (Google) Code Review
parent 6d3747ebe2 03d0f8193a
commit 6007cae425
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1728,7 +1728,7 @@ public final class ActiveServices {
return null; return null;
} }
if (!whileRestarting && r.restartDelay > 0) { if (!whileRestarting && mRestartingServices.contains(r)) {
// If waiting for a restart, then do nothing. // If waiting for a restart, then do nothing.
return null; return null;
} }
@@ -1740,7 +1740,6 @@ public final class ActiveServices {
// We are now bringing the service up, so no longer in the // We are now bringing the service up, so no longer in the
// restarting state. // restarting state.
if (mRestartingServices.remove(r)) { if (mRestartingServices.remove(r)) {
r.resetRestartCounter();
clearRestartingIfNeededLocked(r); clearRestartingIfNeededLocked(r);
} }