diff options
| author | Kyrylo Mikos <kiril.mik.os@gmail.com> | 2014-11-17 13:56:05 +0200 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-10-25 21:49:34 -0700 |
| commit | b2dd57b05867e3b3ad54c480adb812b965796125 (patch) | |
| tree | 26cf8c54306b89ae6ed52ea26d1599a8ac326005 | |
| parent | 04977af9eede5fa2362ddba50c2e3794f2651b48 (diff) | |
| download | frameworks_base-b2dd57b05867e3b3ad54c480adb812b965796125.zip frameworks_base-b2dd57b05867e3b3ad54c480adb812b965796125.tar.gz frameworks_base-b2dd57b05867e3b3ad54c480adb812b965796125.tar.bz2 | |
PhoneWindowmanager: disable panic mechanism when PolicyControl activated.
Change-Id: I5cf5f681237bbd17ec0fe2d041dd782cfb4b72f0
| -rw-r--r-- | services/core/java/com/android/server/policy/PhoneWindowManager.java | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/policy/PolicyControl.java | 4 |
2 files changed, 5 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 4fc535c..e7354d5 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -1061,7 +1061,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { // taken over the whole screen. boolean panic = mImmersiveModeConfirmation.onPowerKeyDown(interactive, SystemClock.elapsedRealtime(), isImmersiveMode(mLastSystemUiFlags)); - if (panic) { + if (panic && !PolicyControl.isImmersiveFiltersActive()) { mHandler.post(mHiddenNavPanic); } diff --git a/services/core/java/com/android/server/policy/PolicyControl.java b/services/core/java/com/android/server/policy/PolicyControl.java index dbafc42..0f6fc58 100644 --- a/services/core/java/com/android/server/policy/PolicyControl.java +++ b/services/core/java/com/android/server/policy/PolicyControl.java @@ -125,6 +125,10 @@ public class PolicyControl { } } + public static boolean isImmersiveFiltersActive() { + return sImmersiveStatusFilter != null || sImmersiveNavigationFilter != null; + } + public static void dump(String prefix, PrintWriter pw) { dump("sImmersiveStatusFilter", sImmersiveStatusFilter, prefix, pw); dump("sImmersiveNavigationFilter", sImmersiveNavigationFilter, prefix, pw); |