Preempt build error from merge with CL (1/2)
Merging CL: Ib674e2e48efaa1cc97d1513dc2c2b27fdb343657
Change-Id: Ic4944b27f9d39dbaccb6baa5ba6761dc4663cd02
diff --git a/InCallUI/src/com/android/incallui/InCallServiceImpl.java b/InCallUI/src/com/android/incallui/InCallServiceImpl.java
index 6e5ea28..bcafbee 100644
--- a/InCallUI/src/com/android/incallui/InCallServiceImpl.java
+++ b/InCallUI/src/com/android/incallui/InCallServiceImpl.java
@@ -91,21 +91,31 @@
}
/** {@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());