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

Merge "Hack to get devices booting again." into mnc-dr1.5-dev

Browse Source 
am: 29700949ad

* commit '29700949ad981bde8d35219914161f6424e7757b':
  Hack to get devices booting again.
This commit is contained in:
Bart Sears
2016-02-01 22:23:34 +00:00
committed by android-build-merger
parent 60e392e021 29700949ad
commit 795e53a36b
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -145,6 +145,8 @@ public class UsageStatsService extends SystemService implements
private boolean mScreenOn;
private long mLastAppIdleParoledTime;
private volatile boolean mPendingOneTimeCheckIdleStates;
long mScreenOnTime;
long mLastScreenOnEventRealtime;
@@ -221,6 +223,10 @@ public class UsageStatsService extends SystemService implements
synchronized (this) {
updateDisplayLocked();
}
if (mPendingOneTimeCheckIdleStates) {
postOneTimeCheckIdleStates();
}
} else if (phase == PHASE_BOOT_COMPLETED) {
setAppIdleParoled(getContext().getSystemService(BatteryManager.class).isCharging());
}
@@ -368,7 +374,13 @@ public class UsageStatsService extends SystemService implements
* scheduling a series of repeating checkIdleStates each time we fired off one.
*/
void postOneTimeCheckIdleStates() {
mHandler.sendEmptyMessage(MSG_ONE_TIME_CHECK_IDLE_STATES);
if (mDeviceIdleController == null) {
// Not booted yet; wait for it!
mPendingOneTimeCheckIdleStates = true;
} else {
mHandler.sendEmptyMessage(MSG_ONE_TIME_CHECK_IDLE_STATES);
mPendingOneTimeCheckIdleStates = false;
}
}
/** Check all running users' or specified user's apps to see if they enter an idle state. */