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

am 9f1ae4dc: am fe9c950a: Merge "Fix parole scheduling bugs." into mnc-dr-dev

Browse Source 
* commit '9f1ae4dc260d099834d386cf1d0074ff54b3f50f':
  Fix parole scheduling bugs.
This commit is contained in:
Jeff Sharkey
2015-10-12 16:49:05 +00:00
committed by Android Git Automerger
parent 75051c3a62 9f1ae4dc26
commit 97604b42d9
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/usage/java/com/android/server/usage/UsageStatsService.java
View File

@@ -314,6 +314,8 @@ public class UsageStatsService extends SystemService implements
mAppIdleParoled = paroled; mAppIdleParoled = paroled;
if (DEBUG) Slog.d(TAG, "Changing paroled to " + mAppIdleParoled); if (DEBUG) Slog.d(TAG, "Changing paroled to " + mAppIdleParoled);
if (paroled) { if (paroled) {
postParoleEndTimeout();
} else {
mLastAppIdleParoledTime = checkAndGetTimeLocked(); mLastAppIdleParoledTime = checkAndGetTimeLocked();
postNextParoleTimeout(); postNextParoleTimeout();
} }
@@ -404,8 +406,6 @@ public class UsageStatsService extends SystemService implements
if (timeSinceLastParole > mAppIdleParoleIntervalMillis) { if (timeSinceLastParole > mAppIdleParoleIntervalMillis) {
if (DEBUG) Slog.d(TAG, "Crossed default parole interval"); if (DEBUG) Slog.d(TAG, "Crossed default parole interval");
setAppIdleParoled(true); setAppIdleParoled(true);
// Make sure it ends at some point
postParoleEndTimeout();
} else { } else {
if (DEBUG) Slog.d(TAG, "Not long enough to go to parole"); if (DEBUG) Slog.d(TAG, "Not long enough to go to parole");
postNextParoleTimeout(); postNextParoleTimeout();
@@ -492,7 +492,6 @@ public class UsageStatsService extends SystemService implements
if (!deviceIdle if (!deviceIdle
&& timeSinceLastParole >= mAppIdleParoleIntervalMillis) { && timeSinceLastParole >= mAppIdleParoleIntervalMillis) {
if (DEBUG) Slog.i(TAG, "Bringing idle apps out of inactive state due to deviceIdleMode=false"); if (DEBUG) Slog.i(TAG, "Bringing idle apps out of inactive state due to deviceIdleMode=false");
postNextParoleTimeout();
setAppIdleParoled(true); setAppIdleParoled(true);
} else if (deviceIdle) { } else if (deviceIdle) {
if (DEBUG) Slog.i(TAG, "Device idle, back to prison"); if (DEBUG) Slog.i(TAG, "Device idle, back to prison");