diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 6262e4bf54cee..ba4b99693e778 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -684,7 +684,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { mVolumeDownKeyConsumedByScreenshotChord = true; cancelPendingPowerKeyAction(); - mHandler.postDelayed(mScreenshotChordLongPress, getScreenshotChordLongPressDelay()); + mHandler.postDelayed(mScreenshotRunnable, getScreenshotChordLongPressDelay()); } } } @@ -700,7 +700,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { } private void cancelPendingScreenshotChordAction() { - mHandler.removeCallbacks(mScreenshotChordLongPress); + mHandler.removeCallbacks(mScreenshotRunnable); } private final Runnable mPowerLongPress = new Runnable() { @@ -738,7 +738,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { } }; - private final Runnable mScreenshotChordLongPress = new Runnable() { + private final Runnable mScreenshotRunnable = new Runnable() { public void run() { takeScreenshot(); } @@ -1975,6 +1975,11 @@ public class PhoneWindowManager implements WindowManagerPolicy { } } return -1; + } else if (keyCode == KeyEvent.KEYCODE_SYSRQ) { + if (down && repeatCount == 0) { + mHandler.post(mScreenshotRunnable); + } + return -1; } // Shortcuts are invoked through Search+key, so intercept those here