summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorScott Mertz <scott@cyngn.com>2016-05-31 17:28:29 -0700
committerScott Mertz <scott@cyngn.com>2016-05-31 17:41:40 -0700
commit44e91e0ed2b3056e30ccfbb009be5f19495061ce (patch)
tree4b1646abc97826072927489ae3e1eb87b9769fe4 /services
parent70d2082f7d7253f8cf5d578507f44fd6e28ce706 (diff)
downloadframeworks_base-44e91e0ed2b3056e30ccfbb009be5f19495061ce.zip
frameworks_base-44e91e0ed2b3056e30ccfbb009be5f19495061ce.tar.gz
frameworks_base-44e91e0ed2b3056e30ccfbb009be5f19495061ce.tar.bz2
fw: reintroduce PRIVATE_FLAG_PREVENT_POWER_KEY
Switching the PREVENT_SYSTEM_KEYS forces the application to handle every system key. Some apps may not want to handle every single key, so allow them to just handle the power key. CYNGNOS-2958 Change-Id: I43fd65e67b909e6d52548f110ff9997b829b3e15
Diffstat (limited to 'services')
-rw-r--r--services/core/java/com/android/server/policy/PhoneWindowManager.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index 1f9db49..98104b7 100644
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -3265,7 +3265,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
if (mTopFullscreenOpaqueWindowState != null &&
(mTopFullscreenOpaqueWindowState.getAttrs().privateFlags
- & WindowManager.LayoutParams.PRIVATE_FLAG_PREVENT_SYSTEM_KEYS) != 0
+ & (WindowManager.LayoutParams.PRIVATE_FLAG_PREVENT_SYSTEM_KEYS |
+ WindowManager.LayoutParams.PRIVATE_FLAG_PREVENT_POWER_KEY)) != 0
&& mScreenOnFully) {
return 0;
}