summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2014-12-17 00:30:26 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-17 00:30:26 +0000
commit50d8e5b0c067a532f893889ce58125233a12f7fc (patch)
treea1e987c237f2fca5fe9580fa3f378748e0e61754
parent799ff2ea099bdedf5b93630c2ab3cc362f022e70 (diff)
parentd3836e9df4ee0b22dd115e96abe976730263129d (diff)
downloadframeworks_base-50d8e5b0c067a532f893889ce58125233a12f7fc.zip
frameworks_base-50d8e5b0c067a532f893889ce58125233a12f7fc.tar.gz
frameworks_base-50d8e5b0c067a532f893889ce58125233a12f7fc.tar.bz2
am d3836e9d: Merge "Revert "Allow home to be pressed while in incoming call screen"" into lmp-mr1-dev
* commit 'd3836e9df4ee0b22dd115e96abe976730263129d': Revert "Allow home to be pressed while in incoming call screen"
-rw-r--r--policy/src/com/android/internal/policy/impl/PhoneWindowManager.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
index c2a09ee..59dee4d 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -2452,6 +2452,15 @@ public class PhoneWindowManager implements WindowManagerPolicy {
return -1;
}
+ // If an incoming call is ringing, HOME is totally disabled.
+ // (The user is already on the InCallUI at this point,
+ // and his ONLY options are to answer or reject the call.)
+ TelecomManager telecomManager = getTelecommService();
+ if (telecomManager != null && telecomManager.isRinging()) {
+ Log.i(TAG, "Ignoring HOME; there's a ringing incoming call.");
+ return -1;
+ }
+
// Delay handling home if a double-tap is possible.
if (mDoubleTapOnHomeBehavior != DOUBLE_TAP_HOME_NOTHING) {
mHandler.removeCallbacks(mHomeDoubleTapTimeoutRunnable); // just in case