diff options
| author | Santos Cordon <santoscordon@google.com> | 2014-06-10 18:05:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-10 18:05:25 +0000 |
| commit | fa20dfed78b5ef8dd2949457ebd68a3f9821351b (patch) | |
| tree | 1100941d0921549c774d7b0f6ef7472a92823406 | |
| parent | 32b8067bbd3f86f861f09e00cd666030faf3d9c3 (diff) | |
| parent | 5baf167965ef3c5c63343c097d42c49f1f252638 (diff) | |
am beca6d63: Merge "Do not set a full-screen intent if incall screen is already up." into lmp-preview-dev
* commit 'beca6d6353d5bc65f7e68cdeffd71dda979c5b49':
Do not set a full-screen intent if incall screen is already up.
| -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); } |