diff options
| author | Yorke Lee <yorkelee@google.com> | 2014-10-14 19:44:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-14 19:44:05 +0000 |
| commit | 3299c571118180fb6c20de53bf2b366453ccf493 (patch) | |
| tree | a58eb4e41cddad6d9449adef2531a3aed37054b8 /policy | |
| parent | 26d75a9e0086dee2f2e59ede4e502ad93ca3068c (diff) | |
| parent | 50a0e30525b1d67b5e9a9cb686ffb4d2dd729672 (diff) | |
| download | frameworks_base-3299c571118180fb6c20de53bf2b366453ccf493.zip frameworks_base-3299c571118180fb6c20de53bf2b366453ccf493.tar.gz frameworks_base-3299c571118180fb6c20de53bf2b366453ccf493.tar.bz2 | |
am 50a0e305: am 8c63f98b: Merge "Allow home to be pressed while in incoming call screen" into lmp-mr1-dev
* commit '50a0e30525b1d67b5e9a9cb686ffb4d2dd729672':
Allow home to be pressed while in incoming call screen
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 2699d13..3dfaf7d 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -2208,15 +2208,6 @@ 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 |