diff --git a/frameworks/base/services/core/java/com/android/server/policy/PhoneWindowManager.java b/frameworks/base/services/core/java/com/android/server/policy/PhoneWindowManager.java
old mode 100644
new mode 100755
index 7d82640dc48..e579e07125f
--- a/frameworks/base/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/frameworks/base/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -1336,14 +1336,15 @@ public class PhoneWindowManager implements WindowManagerPolicy {
private void interceptScreenshotChord() {
if (mScreenshotChordEnabled
- && mScreenshotChordVolumeDownKeyTriggered && mScreenshotChordPowerKeyTriggered
- && !mA11yShortcutChordVolumeUpKeyTriggered) {
+ && !mScreenshotChordVolumeDownKeyTriggered && mScreenshotChordPowerKeyTriggered
+ && mA11yShortcutChordVolumeUpKeyTriggered) {
final long now = SystemClock.uptimeMillis();
- if (now + if (now && now
+ SCREENSHOT_CHORD_DEBOUNCE_DELAY_MILLIS) {
mScreenshotChordVolumeDownKeyConsumed = true;
- cancelPendingPowerKeyAction();
+ //cancelPendingPowerKeyAction();
+ mA11yShortcutChordVolumeUpKeyConsumed = true;
mScreenshotRunnable.setScreenshotType(TAKE_SCREENSHOT_FULLSCREEN);
mScreenshotRunnable.setScreenshotSource(SCREENSHOT_KEY_CHORD);
mHandler.postDelayed(mScreenshotRunnable, getScreenshotChordLongPressDelay());
@@ -3722,7 +3723,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
mScreenshotChordVolumeDownKeyTime = event.getDownTime();
mScreenshotChordVolumeDownKeyConsumed = false;
cancelPendingPowerKeyAction();
- interceptScreenshotChord();
+ //interceptScreenshotChord();
interceptAccessibilityShortcutChord();
}
} else {
@@ -3740,6 +3741,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
cancelPendingPowerKeyAction();
cancelPendingScreenshotChordAction();
cancelPendingRingerToggleChordAction();
+ interceptScreenshotChord();
interceptAccessibilityShortcutChord();
interceptRingerToggleChord();