diff options
author | Santos Cordon <santoscordon@google.com> | 2014-05-29 21:11:38 -0700 |
---|---|---|
committer | Santos Cordon <santoscordon@google.com> | 2014-05-30 13:23:47 -0700 |
commit | f4aa0f8a649fe634ebaea1618325c5cb7effbf7e (patch) | |
tree | 2e010c68a40d28ab27f69d9d7698023657eabf9e | |
parent | e47300c4f225807915c3667b0c5a9b689c7caa38 (diff) |
Preempt build error from merge with CL (1/2)
Merging CL: Ib674e2e48efaa1cc97d1513dc2c2b27fdb343657
Change-Id: Ic4944b27f9d39dbaccb6baa5ba6761dc4663cd02
-rw-r--r-- | InCallUI/src/com/android/incallui/InCallServiceImpl.java | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/InCallUI/src/com/android/incallui/InCallServiceImpl.java b/InCallUI/src/com/android/incallui/InCallServiceImpl.java index 6e5ea28bb..bcafbee4f 100644 --- a/InCallUI/src/com/android/incallui/InCallServiceImpl.java +++ b/InCallUI/src/com/android/incallui/InCallServiceImpl.java @@ -91,21 +91,31 @@ public class InCallServiceImpl extends InCallService { } /** {@inheritDoc} */ - @Override protected void setPostDial(String callId, String remaining) { + @Override + protected void setPostDial(String callId, String remaining) { // TODO(ihab): Add post-dial state to user interface } /** {@inheritDoc} */ - @Override protected void setPostDialWait(String callId, String remaining) { + @Override + protected void setPostDialWait(String callId, String remaining) { // TODO(ihab): Add post-dial state to user interface } /** {@inheritDoc} */ - @Override protected void onAudioStateChanged(CallAudioState audioState) { + @Override + protected void onAudioStateChanged(CallAudioState audioState) { AudioModeProvider.getInstance().onAudioModeChange(audioState.route, audioState.isMuted); AudioModeProvider.getInstance().onSupportedAudioModeChange(audioState.supportedRouteMask); } + /** {@inheritDoc} */ + @Override + protected void bringToForeground(boolean showDialpad) { + Log.i(this, "Bringing UI to foreground."); + InCallPresenter.getInstance().bringToForeground(showDialpad); + } + private void updateCall(Call call, InCallCall telecommCall) { call.setHandle(telecommCall.getHandle()); call.setDisconnectCause(telecommCall.getDisconnectCause()); |