summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorSantos Cordon <santoscordon@google.com>2014-05-30 13:21:13 -0700
committerSantos Cordon <santoscordon@google.com>2014-05-30 14:27:03 -0700
commitdd36901ac004a2fef88247f9f54059b24ee5118c (patch)
tree4c71daa7844c9c5ba35908bc37501593a1eb1149 /api
parent2157b9dcef00eac182b557b4d78cb66c31eba1bd (diff)
downloadframeworks_base-dd36901ac004a2fef88247f9f54059b24ee5118c.zip
frameworks_base-dd36901ac004a2fef88247f9f54059b24ee5118c.tar.gz
frameworks_base-dd36901ac004a2fef88247f9f54059b24ee5118c.tar.bz2
Preempt build error from merge with CL (2/2)
Merging CL: Ib674e2e48efaa1cc97d1513dc2c2b27fdb343657 Change-Id: Ic4944b27f9d39dbaccb6baa5ba6761dc4663cd02
Diffstat (limited to 'api')
-rw-r--r--api/current.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 8f2c5a6..3f31c84 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);