diff options
| author | Santos Cordon <santoscordon@google.com> | 2015-04-15 11:05:16 -0700 |
|---|---|---|
| committer | Santos Cordon <santoscordon@google.com> | 2015-04-16 16:50:17 -0700 |
| commit | 7e24657d07868739754fd53fa7da97cb05e2e27d (patch) | |
| tree | fbfe4ef94d613288086c43e9c933bf68b1a607a3 /api | |
| parent | 7f22726ff3816a03192f249ebabffcd36274b85f (diff) | |
| download | frameworks_base-7e24657d07868739754fd53fa7da97cb05e2e27d.zip frameworks_base-7e24657d07868739754fd53fa7da97cb05e2e27d.tar.gz frameworks_base-7e24657d07868739754fd53fa7da97cb05e2e27d.tar.bz2 | |
DO NOT MERGE Move Phone.java APIs into InCallService
This change is one step in the right direction of getting rid of
Phone.java.
Phone.java was deemed superfluous and this change moves the methods
previously exposed in Phone.java into InCallService. This was done by
having InCallService listen to Phone and pipe the calls as appropriate.
However, state still lives in Phone and we eventually want to move that
code into InCallService. That will be done in a later CL.
Bug: 20160495
Change-Id: Id142431c253c1f24f260da42e8bedd1eb2ce448b
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 13 | ||||
| -rw-r--r-- | api/system-current.txt | 10 |
2 files changed, 20 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt index 24fc007..0355d5d 100644 --- a/api/current.txt +++ b/api/current.txt @@ -28639,10 +28639,17 @@ package android.telecom { public abstract class InCallService extends android.app.Service { ctor public InCallService(); - method public final android.telecom.Phone getPhone(); + method public final boolean canAddCall(); + method public final android.telecom.AudioState getAudioState(); + method public final java.util.List<android.telecom.Call> getCalls(); + method public void onAudioStateChanged(android.telecom.AudioState); method public android.os.IBinder onBind(android.content.Intent); - method public void onPhoneCreated(android.telecom.Phone); - method public void onPhoneDestroyed(android.telecom.Phone); + method public void onBringToForeground(boolean); + method public void onCallAdded(android.telecom.Call); + method public void onCallRemoved(android.telecom.Call); + method public void onCanAddCallChanged(boolean); + method public final void setAudioRoute(int); + method public final void setMuted(boolean); field public static final java.lang.String SERVICE_INTERFACE = "android.telecom.InCallService"; } diff --git a/api/system-current.txt b/api/system-current.txt index ead5bdf..563c659 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -30455,10 +30455,20 @@ package android.telecom { public abstract class InCallService extends android.app.Service { ctor public InCallService(); + method public final boolean canAddCall(); + method public final android.telecom.AudioState getAudioState(); + method public final java.util.List<android.telecom.Call> getCalls(); method public final android.telecom.Phone getPhone(); + method public void onAudioStateChanged(android.telecom.AudioState); method public android.os.IBinder onBind(android.content.Intent); + method public void onBringToForeground(boolean); + method public void onCallAdded(android.telecom.Call); + method public void onCallRemoved(android.telecom.Call); + method public void onCanAddCallChanged(boolean); method public void onPhoneCreated(android.telecom.Phone); method public void onPhoneDestroyed(android.telecom.Phone); + method public final void setAudioRoute(int); + method public final void setMuted(boolean); field public static final java.lang.String SERVICE_INTERFACE = "android.telecom.InCallService"; } |