Merge "Add Option To Prevent Wake On Back Key Press" into rvc-dev
diff --git a/core/java/android/view/KeyEvent.java b/core/java/android/view/KeyEvent.java
index c91096e..235f5e1 100644
--- a/core/java/android/view/KeyEvent.java
+++ b/core/java/android/view/KeyEvent.java
@@ -1941,7 +1941,6 @@
/** @hide */
public static final boolean isWakeKey(int keyCode) {
switch (keyCode) {
- case KeyEvent.KEYCODE_BACK:
case KeyEvent.KEYCODE_CAMERA:
case KeyEvent.KEYCODE_MENU:
case KeyEvent.KEYCODE_PAIRING:
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 4ac51c6..490892e 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -4404,6 +4404,7 @@
Determines whether the specified key groups can be used to wake up the device. -->
<bool name="config_wakeOnDpadKeyPress">true</bool>
<bool name="config_wakeOnAssistKeyPress">true</bool>
+ <bool name="config_wakeOnBackKeyPress">true</bool>
<!-- Whether to default to an expanded list of users on the lock screen user switcher. -->
<bool name="config_expandLockScreenUserSwitcher">false</bool>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index d595459..1c6aba7 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -3051,6 +3051,7 @@
<!-- Override Wake Key Behavior When Screen is Off -->
<java-symbol type="bool" name="config_wakeOnDpadKeyPress" />
<java-symbol type="bool" name="config_wakeOnAssistKeyPress" />
+ <java-symbol type="bool" name="config_wakeOnBackKeyPress" />
<!-- Pinner Service -->
<java-symbol type="array" name="config_defaultPinnerServiceFiles" />
diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index 19e6062..5081b0f 100644
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -482,6 +482,7 @@
MetricsLogger mLogger;
boolean mWakeOnDpadKeyPress;
boolean mWakeOnAssistKeyPress;
+ boolean mWakeOnBackKeyPress;
private boolean mHandleVolumeKeysInWM;
@@ -1736,6 +1737,8 @@
res.getBoolean(com.android.internal.R.bool.config_wakeOnDpadKeyPress);
mWakeOnAssistKeyPress =
res.getBoolean(com.android.internal.R.bool.config_wakeOnAssistKeyPress);
+ mWakeOnBackKeyPress =
+ res.getBoolean(com.android.internal.R.bool.config_wakeOnBackKeyPress);
// Init display burn-in protection
boolean burnInProtectionEnabled = context.getResources().getBoolean(
@@ -4107,6 +4110,9 @@
case KeyEvent.KEYCODE_ASSIST:
return mWakeOnAssistKeyPress;
+
+ case KeyEvent.KEYCODE_BACK:
+ return mWakeOnBackKeyPress;
}
return true;