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

am 77d5b914: Merge "DO NOT MERGE: Idle Job Start During SCREEN_ON or DREAMING_STOPPED" into mnc-dev

Browse Source 
* commit '77d5b91401d87610128d9bf656f66c0d74bcb254':
  DO NOT MERGE: Idle Job Start During SCREEN_ON or DREAMING_STOPPED
This commit is contained in:
Matthew Williams
2015-08-10 22:45:10 +00:00
committed by Android Git Automerger
parent 5ca842ae08 77d5b91401
commit 2c8c251e73
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/java/com/android/server/job/controllers/IdleController.java
View File

@@ -108,6 +108,7 @@ public class IdleController extends StateController {
private AlarmManager mAlarm; private AlarmManager mAlarm;
private PendingIntent mIdleTriggerIntent; private PendingIntent mIdleTriggerIntent;
boolean mIdle; boolean mIdle;
boolean mScreenOn;
public IdlenessTracker() { public IdlenessTracker() {
mAlarm = (AlarmManager) mContext.getSystemService(Context.ALARM_SERVICE); mAlarm = (AlarmManager) mContext.getSystemService(Context.ALARM_SERVICE);
@@ -120,6 +121,7 @@ public class IdleController extends StateController {
// At boot we presume that the user has just "interacted" with the // At boot we presume that the user has just "interacted" with the
// device in some meaningful way. // device in some meaningful way.
mIdle = false; mIdle = false;
mScreenOn = true;
} }
public boolean isIdle() { public boolean isIdle() {
@@ -149,12 +151,14 @@ public class IdleController extends StateController {
if (action.equals(Intent.ACTION_SCREEN_ON) if (action.equals(Intent.ACTION_SCREEN_ON)
|| action.equals(Intent.ACTION_DREAMING_STOPPED)) { || action.equals(Intent.ACTION_DREAMING_STOPPED)) {
// possible transition to not-idle
if (mIdle) {
if (DEBUG) { if (DEBUG) {
Slog.v(TAG,"exiting idle : " + action); Slog.v(TAG,"exiting idle : " + action);
} }
mScreenOn = true;
//cancel the alarm
mAlarm.cancel(mIdleTriggerIntent); mAlarm.cancel(mIdleTriggerIntent);
if (mIdle) {
// possible transition to not-idle
mIdle = false; mIdle = false;
reportNewIdleState(mIdle); reportNewIdleState(mIdle);
} }
@@ -169,11 +173,12 @@ public class IdleController extends StateController {
Slog.v(TAG, "Scheduling idle : " + action + " now:" + nowElapsed + " when=" Slog.v(TAG, "Scheduling idle : " + action + " now:" + nowElapsed + " when="
+ when); + when);
} }
mScreenOn = false;
mAlarm.setWindow(AlarmManager.ELAPSED_REALTIME_WAKEUP, mAlarm.setWindow(AlarmManager.ELAPSED_REALTIME_WAKEUP,
when, IDLE_WINDOW_SLOP, mIdleTriggerIntent); when, IDLE_WINDOW_SLOP, mIdleTriggerIntent);
} else if (action.equals(ACTION_TRIGGER_IDLE)) { } else if (action.equals(ACTION_TRIGGER_IDLE)) {
// idle time starts now // idle time starts now. Do not set mIdle if screen is on.
if (!mIdle) { if (!mIdle && !mScreenOn) {
if (DEBUG) { if (DEBUG) {
Slog.v(TAG, "Idle trigger fired @ " + SystemClock.elapsedRealtime()); Slog.v(TAG, "Idle trigger fired @ " + SystemClock.elapsedRealtime());
} }