diff options
| author | Santos Cordon <santoscordon@google.com> | 2015-04-16 23:42:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-16 23:42:01 +0000 |
| commit | 223a80d7c6c40d468319f15af2a73c8681b19f1c (patch) | |
| tree | 787e271937e3e14b6f5477f16c18048218dfa344 /api | |
| parent | f8e24ccf374ff4c0e41ffa0ff474f90b3c9cf1a2 (diff) | |
| parent | 29886d8571b703c4b9559d51421e8051bb1641c1 (diff) | |
| download | frameworks_base-223a80d7c6c40d468319f15af2a73c8681b19f1c.zip frameworks_base-223a80d7c6c40d468319f15af2a73c8681b19f1c.tar.gz frameworks_base-223a80d7c6c40d468319f15af2a73c8681b19f1c.tar.bz2 | |
Merge "Unfinal getPhone."
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 19 | ||||
| -rw-r--r-- | api/system-current.txt | 8 |
2 files changed, 4 insertions, 23 deletions
diff --git a/api/current.txt b/api/current.txt index c659e21..326ad86 100644 --- a/api/current.txt +++ b/api/current.txt @@ -30328,25 +30328,6 @@ package android.telecom { ctor public InCallService.VideoCall.Listener(); } - public final class Phone { - method public final void addListener(android.telecom.Phone.Listener); - 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 void removeListener(android.telecom.Phone.Listener); - method public final void setAudioRoute(int); - method public final void setMuted(boolean); - } - - public static abstract class Phone.Listener { - ctor public Phone.Listener(); - method public void onAudioStateChanged(android.telecom.Phone, android.telecom.AudioState); - method public void onBringToForeground(android.telecom.Phone, boolean); - method public void onCallAdded(android.telecom.Phone, android.telecom.Call); - method public void onCallRemoved(android.telecom.Phone, android.telecom.Call); - method public void onCanAddCallChanged(android.telecom.Phone, boolean); - } - public class PhoneAccount implements android.os.Parcelable { method public static android.telecom.PhoneAccount.Builder builder(android.telecom.PhoneAccountHandle, java.lang.CharSequence); method public android.graphics.drawable.Drawable createIconDrawable(android.content.Context); diff --git a/api/system-current.txt b/api/system-current.txt index 2c15005..bd7e5a8 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -32392,15 +32392,15 @@ package android.telecom { 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 deprecated 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 deprecated void onPhoneCreated(android.telecom.Phone); + method public deprecated 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"; @@ -32437,7 +32437,7 @@ package android.telecom { ctor public InCallService.VideoCall.Listener(); } - public final class Phone { + public final deprecated class Phone { method public final void addListener(android.telecom.Phone.Listener); method public final boolean canAddCall(); method public final android.telecom.AudioState getAudioState(); |