summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwilll03 <wgangers@gmail.com>2014-12-08 11:13:28 -0500
committerSteve Kondik <steve@cyngn.com>2015-10-26 21:55:35 -0700
commitc29e4b193ff2003cca562aede624a747e38a87b1 (patch)
treeed6857024531964e3f55d2418a119c04e07346d0
parentf4752bd4be173e795a9c55c5a98c776dcc98a1c1 (diff)
downloadframeworks_base-c29e4b193ff2003cca562aede624a747e38a87b1.zip
frameworks_base-c29e4b193ff2003cca562aede624a747e38a87b1.tar.gz
frameworks_base-c29e4b193ff2003cca562aede624a747e38a87b1.tar.bz2
Only go HOME if screen is fully awake
Avoid going home when hardware home button is used to wake the device on an insecure keyguard Change-Id: I5d5d8c4fff76967c29e70251f7b165205005ba11
-rw-r--r--services/core/java/com/android/server/policy/PhoneWindowManager.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index ad1489a..639a600 100644
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -3835,8 +3835,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
}
sendCloseSystemWindows(SYSTEM_DIALOG_REASON_HOME_KEY);
hideRecentApps(false, true);
- } else {
- // Otherwise, just launch Home
+ } else if (mScreenOnFully) {
+ // check if screen is fully on before going home
+ // to avoid hardware home button wake going home
sendCloseSystemWindows(SYSTEM_DIALOG_REASON_HOME_KEY);
startDockOrHome(true /*fromHomeKey*/, awakenFromDreams);
}