diff options
author | Yorke Lee <yorkelee@google.com> | 2014-12-17 00:39:01 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-17 00:39:01 +0000 |
commit | 6d679379ad1ac6482e6341243b587358219cdb68 (patch) | |
tree | 80305c5b2da44943a2261cd359bcad161e447773 /InCallUI | |
parent | 66f192fb049d31e2c9199bff9d700afb94d2e6a7 (diff) | |
parent | 99dcc5314c33fb78d35ad86f056154edb06d37ff (diff) |
am 910073d7: am 5996246f: Merge "Revert "Allow back to be pressed while in incoming call screen"" into lmp-mr1-dev
* commit '910073d71fabb2dd24b43d67068f076f1b42a81b':
Revert "Allow back to be pressed while in incoming call screen"
Diffstat (limited to 'InCallUI')
-rw-r--r-- | InCallUI/src/com/android/incallui/InCallActivity.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/InCallUI/src/com/android/incallui/InCallActivity.java b/InCallUI/src/com/android/incallui/InCallActivity.java index 006936411..6f48a359b 100644 --- a/InCallUI/src/com/android/incallui/InCallActivity.java +++ b/InCallUI/src/com/android/incallui/InCallActivity.java @@ -330,6 +330,13 @@ public class InCallActivity extends Activity { return; } + // Always disable the Back key while an incoming call is ringing + final Call call = CallList.getInstance().getIncomingCall(); + if (call != null) { + Log.d(this, "Consume Back press for an incoming call"); + return; + } + // Nothing special to do. Fall back to the default behavior. super.onBackPressed(); } |