From dd36901ac004a2fef88247f9f54059b24ee5118c Mon Sep 17 00:00:00 2001 From: Santos Cordon Date: Fri, 30 May 2014 13:21:13 -0700 Subject: [PATCH] Preempt build error from merge with CL (2/2) Merging CL: Ib674e2e48efaa1cc97d1513dc2c2b27fdb343657 Change-Id: Ic4944b27f9d39dbaccb6baa5ba6761dc4663cd02 --- api/current.txt | 1 + telecomm/java/android/telecomm/InCallService.java | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/api/current.txt b/api/current.txt index 8f2c5a6e9de03..3f31c84a12bde 100644 --- a/api/current.txt +++ b/api/current.txt @@ -27861,6 +27861,7 @@ package android.telecomm { public abstract class InCallService extends android.app.Service { ctor protected InCallService(); method protected abstract void addCall(android.telecomm.InCallCall); + method protected abstract void bringToForeground(boolean); method protected final android.telecomm.InCallAdapter getAdapter(); method protected void onAdapterAttached(android.telecomm.InCallAdapter); method protected abstract void onAudioStateChanged(android.telecomm.CallAudioState); diff --git a/telecomm/java/android/telecomm/InCallService.java b/telecomm/java/android/telecomm/InCallService.java index 63b2020c40d77..7b1cdf27bd406 100644 --- a/telecomm/java/android/telecomm/InCallService.java +++ b/telecomm/java/android/telecomm/InCallService.java @@ -206,4 +206,11 @@ public abstract class InCallService extends Service { * @param audioState The new {@link CallAudioState}. */ protected abstract void onAudioStateChanged(CallAudioState audioState); + + /** + * Brings the in-call screen to the foreground. + * + * @param showDialpad If true, put up the dialpad when the screen is shown. + */ + protected abstract void bringToForeground(boolean showDialpad); }