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

am 8f7b84e0: Merge "Always wake device on power key from non interactive immediately." into lmp-sprout-dev

Browse Source 
* commit '8f7b84e037e35db9d3b46873bc1adf712b307cbe':
  Always wake device on power key from non interactive immediately.
This commit is contained in:
Bryce Lee
2014-11-18 19:12:43 +00:00
committed by Android Git Automerger
parent 9522055f1d 8f7b84e037
commit d4e55bdfc5
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
View File

@@ -319,6 +319,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
// handler thread. We'll need to resolve this someday by teaching the input dispatcher
// to hold wakelocks during dispatch and eliminating the critical path.
volatile boolean mPowerKeyHandled;
volatile boolean mBeganFromNonInteractive;
volatile int mPowerKeyPressCounter;
volatile boolean mEndCallKeyHandled;
@@ -882,15 +883,13 @@ public class PhoneWindowManager implements WindowManagerPolicy {
ViewConfiguration.get(mContext).getDeviceGlobalActionKeyTimeout());
}
} else {
// When non-interactive, we ordinarily wake up immediately and
// consume the key. However on some devices we need to support multi-press
// without waking so we will delay handling for later in that case
// (at the cost of increased latency).
wakeUpFromPowerKey(event.getDownTime());
final int maxCount = getMaxMultiPressPowerCount();
if (maxCount <= 1) {
// No other actions. We can wake immediately.
wakeUpFromPowerKey(event.getDownTime());
mPowerKeyHandled = true;
} else {
mBeganFromNonInteractive = true;
}
}
}
@@ -927,6 +926,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
}
private void finishPowerKeyPress() {
mBeganFromNonInteractive = false;
mPowerKeyPressCounter = 0;
if (mPowerKeyWakeLock.isHeld()) {
mPowerKeyWakeLock.release();
@@ -951,9 +951,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
powerMultiPressAction(eventTime, interactive, mDoublePressOnPowerBehavior);
} else if (count == 3) {
powerMultiPressAction(eventTime, interactive, mTriplePressOnPowerBehavior);
} else if (!interactive) {
wakeUpFromPowerKey(eventTime);
} else {
} else if (interactive && !mBeganFromNonInteractive) {
switch (mShortPressOnPowerBehavior) {
case SHORT_PRESS_POWER_NOTHING:
break;