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

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

Browse Source 
* commit 'fe9c950a49a9bcdb9e35f709a7d1fffad58aa414':
  Fix parole scheduling bugs.
This commit is contained in:
Jeff Sharkey
2015-10-12 16:39:38 +00:00
committed by Android Git Automerger
parent 7f6d8754e6 fe9c950a49
commit 9f1ae4dc26
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;
if (DEBUG) Slog.d(TAG, "Changing paroled to " + mAppIdleParoled);
if (paroled) {
postParoleEndTimeout();
} else {
mLastAppIdleParoledTime = checkAndGetTimeLocked();
postNextParoleTimeout();
}
@@ -404,8 +406,6 @@ public class UsageStatsService extends SystemService implements
if (timeSinceLastParole > mAppIdleParoleIntervalMillis) {
if (DEBUG) Slog.d(TAG, "Crossed default parole interval");
setAppIdleParoled(true);
// Make sure it ends at some point
postParoleEndTimeout();
} else {
if (DEBUG) Slog.d(TAG, "Not long enough to go to parole");
postNextParoleTimeout();
@@ -492,7 +492,6 @@ public class UsageStatsService extends SystemService implements
if (!deviceIdle
&& timeSinceLastParole >= mAppIdleParoleIntervalMillis) {
if (DEBUG) Slog.i(TAG, "Bringing idle apps out of inactive state due to deviceIdleMode=false");
postNextParoleTimeout();
setAppIdleParoled(true);
} else if (deviceIdle) {
if (DEBUG) Slog.i(TAG, "Device idle, back to prison");