am 608ad140: Merge "Idle Job Start During SCREEN_ON or DREAMING_STOPPED"
* commit '608ad1409dc3cd86a66208ddaa31e3a4c54adfac': Idle Job Start During SCREEN_ON or DREAMING_STOPPED
This commit is contained in:
@@ -109,6 +109,7 @@ public class IdleController extends StateController {
|
||||
private AlarmManager mAlarm;
|
||||
private PendingIntent mIdleTriggerIntent;
|
||||
boolean mIdle;
|
||||
boolean mScreenOn;
|
||||
|
||||
public IdlenessTracker() {
|
||||
mAlarm = (AlarmManager) mContext.getSystemService(Context.ALARM_SERVICE);
|
||||
@@ -121,6 +122,7 @@ public class IdleController extends StateController {
|
||||
// At boot we presume that the user has just "interacted" with the
|
||||
// device in some meaningful way.
|
||||
mIdle = false;
|
||||
mScreenOn = true;
|
||||
}
|
||||
|
||||
public boolean isIdle() {
|
||||
@@ -150,12 +152,14 @@ public class IdleController extends StateController {
|
||||
|
||||
if (action.equals(Intent.ACTION_SCREEN_ON)
|
||||
|| action.equals(Intent.ACTION_DREAMING_STOPPED)) {
|
||||
// possible transition to not-idle
|
||||
if (DEBUG) {
|
||||
Slog.v(TAG,"exiting idle : " + action);
|
||||
}
|
||||
mScreenOn = true;
|
||||
//cancel the alarm
|
||||
mAlarm.cancel(mIdleTriggerIntent);
|
||||
if (mIdle) {
|
||||
if (DEBUG) {
|
||||
Slog.v(TAG, "exiting idle : " + action);
|
||||
}
|
||||
mAlarm.cancel(mIdleTriggerIntent);
|
||||
// possible transition to not-idle
|
||||
mIdle = false;
|
||||
reportNewIdleState(mIdle);
|
||||
}
|
||||
@@ -170,11 +174,12 @@ public class IdleController extends StateController {
|
||||
Slog.v(TAG, "Scheduling idle : " + action + " now:" + nowElapsed + " when="
|
||||
+ when);
|
||||
}
|
||||
mScreenOn = false;
|
||||
mAlarm.setWindow(AlarmManager.ELAPSED_REALTIME_WAKEUP,
|
||||
when, IDLE_WINDOW_SLOP, mIdleTriggerIntent);
|
||||
} else if (action.equals(ACTION_TRIGGER_IDLE)) {
|
||||
// idle time starts now
|
||||
if (!mIdle) {
|
||||
// idle time starts now. Do not set mIdle if screen is on.
|
||||
if (!mIdle && !mScreenOn) {
|
||||
if (DEBUG) {
|
||||
Slog.v(TAG, "Idle trigger fired @ " + SystemClock.elapsedRealtime());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user