diff options
author | Yorke Lee <yorkelee@google.com> | 2014-12-17 00:16:42 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-17 00:16:43 +0000 |
commit | f5b50cf02b16c328f71b17afc4f6b993a2eee0dc (patch) | |
tree | 6cc55108910f9b67c0443225e82b9aaa5251e148 | |
parent | f14a8057bb7e87c163ad6093e03c398cb416a2a0 (diff) | |
parent | b5a3128869281c97fe75dee77403857b215585cd (diff) |
Merge "Revert "Allow back to be pressed while in incoming call screen"" into lmp-mr1-dev
-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(); } |