diff options
| author | yueg <yueg@google.com> | 2018-03-15 12:12:50 -0700 |
|---|---|---|
| committer | Copybara-Service <copybara-piper@google.com> | 2018-03-15 12:19:01 -0700 |
| commit | 448dc9060e5106a896c8347b660d258732bd79fa (patch) | |
| tree | a870c496c72921a2e4132b34b3b42d4feccf5864 /java/com/android/incallui/ReturnToCallController.java | |
| parent | 9dc2477968f0ed0b1ead99c896353c5365a33fc2 (diff) | |
Fix bubble not showing on device restart.
Test: ReturnToCallControllerTest
PiperOrigin-RevId: 189225436
Change-Id: I845855d0b66941e311f3db239d10249015473c65
Diffstat (limited to 'java/com/android/incallui/ReturnToCallController.java')
| -rw-r--r-- | java/com/android/incallui/ReturnToCallController.java | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/java/com/android/incallui/ReturnToCallController.java b/java/com/android/incallui/ReturnToCallController.java index 6227c77bd..9dfb73bae 100644 --- a/java/com/android/incallui/ReturnToCallController.java +++ b/java/com/android/incallui/ReturnToCallController.java @@ -108,6 +108,11 @@ public class ReturnToCallController implements InCallUiListener, Listener, Audio @Override public void onUiShowing(boolean showing) { + if (!isEnabled(context)) { + hide(); + return; + } + LogUtil.i("ReturnToCallController.onUiShowing", "showing: " + showing); if (showing) { LogUtil.i("ReturnToCallController.onUiShowing", "going to hide"); @@ -155,8 +160,7 @@ public class ReturnToCallController implements InCallUiListener, Listener, Audio canShowBubblesForTesting = canShowBubbles; } - @VisibleForTesting - public Bubble startBubble() { + private Bubble startBubble() { if (!canShowBubbles(context)) { LogUtil.i("ReturnToCallController.startBubble", "can't show bubble, no permission"); return null; @@ -178,6 +182,11 @@ public class ReturnToCallController implements InCallUiListener, Listener, Audio @Override public void onCallListChange(CallList callList) { + if (!isEnabled(context)) { + hide(); + return; + } + if ((bubble == null || !bubble.isVisible()) && getCall() != null && !InCallPresenter.getInstance().isShowingInCallUi()) { @@ -188,6 +197,11 @@ public class ReturnToCallController implements InCallUiListener, Listener, Audio @Override public void onDisconnect(DialerCall call) { + if (!isEnabled(context)) { + hide(); + return; + } + LogUtil.enterBlock("ReturnToCallController.onDisconnect"); if (bubble != null && bubble.isVisible() && (getCall() == null)) { // Show "Call ended" and hide bubble when there is no outgoing, active or background call @@ -214,6 +228,11 @@ public class ReturnToCallController implements InCallUiListener, Listener, Audio @Override public void onAudioStateChanged(CallAudioState audioState) { + if (!isEnabled(context)) { + hide(); + return; + } + this.audioState = audioState; if (bubble != null) { bubble.updateActions(generateActions()); |