diff options
| author | Santos Cordon <santoscordon@google.com> | 2014-06-10 15:29:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-10 15:29:56 +0000 |
| commit | 5baf167965ef3c5c63343c097d42c49f1f252638 (patch) | |
| tree | 4890ef02ce3039b7e7ee001f62080e54f5cdfa0f /InCallUI | |
| parent | 66f3806642760c0e4701e69b7ba2551f75cd7954 (diff) | |
| parent | 88fd7bdcc7a8b148f9a9df4ed51902abc23d5c22 (diff) | |
Merge "Do not set a full-screen intent if incall screen is already up." into lmp-preview-dev
Diffstat (limited to 'InCallUI')
| -rw-r--r-- | InCallUI/src/com/android/incallui/StatusBarNotifier.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/InCallUI/src/com/android/incallui/StatusBarNotifier.java b/InCallUI/src/com/android/incallui/StatusBarNotifier.java index b7b36d87d..43aaa4a12 100644 --- a/InCallUI/src/com/android/incallui/StatusBarNotifier.java +++ b/InCallUI/src/com/android/incallui/StatusBarNotifier.java @@ -277,7 +277,8 @@ public class StatusBarNotifier implements InCallPresenter.InCallStateListener { builder.setContentIntent(inCallPendingIntent); // Set the intent as a full screen intent as well if a call is incoming - if (state == Call.State.INCOMING || state == Call.State.CALL_WAITING) { + if ((state == Call.State.INCOMING || state == Call.State.CALL_WAITING) && + !InCallPresenter.getInstance().isShowingInCallUi()) { configureFullScreenIntent(builder, inCallPendingIntent, call); } |