diff options
Diffstat (limited to 'api/current.txt')
-rw-r--r-- | api/current.txt | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/api/current.txt b/api/current.txt index e714550..a065879 100644 --- a/api/current.txt +++ b/api/current.txt @@ -4559,6 +4559,7 @@ package android.app { method public java.lang.String getSortKey(); method public deprecated void setLatestEventInfo(android.content.Context, java.lang.CharSequence, java.lang.CharSequence, android.app.PendingIntent); method public void writeToParcel(android.os.Parcel, int); + field public static final android.media.AudioAttributes AUDIO_ATTRIBUTES_DEFAULT; field public static final java.lang.String CATEGORY_ALARM = "alarm"; field public static final java.lang.String CATEGORY_CALL = "call"; field public static final java.lang.String CATEGORY_EMAIL = "email"; @@ -4615,12 +4616,13 @@ package android.app { field public static final int PRIORITY_LOW = -1; // 0xffffffff field public static final int PRIORITY_MAX = 2; // 0x2 field public static final int PRIORITY_MIN = -2; // 0xfffffffe - field public static final int STREAM_DEFAULT = -1; // 0xffffffff + field public static final deprecated int STREAM_DEFAULT = -1; // 0xffffffff field public static final int VISIBILITY_PRIVATE = 0; // 0x0 field public static final int VISIBILITY_PUBLIC = 1; // 0x1 field public static final int VISIBILITY_SECRET = -1; // 0xffffffff field public android.app.Notification.Action[] actions; - field public int audioStreamType; + field public android.media.AudioAttributes audioAttributes; + field public deprecated int audioStreamType; field public android.widget.RemoteViews bigContentView; field public java.lang.String category; field public int color; @@ -4739,7 +4741,8 @@ package android.app { method public android.app.Notification.Builder setSmallIcon(int, int); method public android.app.Notification.Builder setSortKey(java.lang.String); method public android.app.Notification.Builder setSound(android.net.Uri); - method public android.app.Notification.Builder setSound(android.net.Uri, int); + method public deprecated android.app.Notification.Builder setSound(android.net.Uri, int); + method public android.app.Notification.Builder setSound(android.net.Uri, android.media.AudioAttributes); method public android.app.Notification.Builder setStyle(android.app.Notification.Style); method public android.app.Notification.Builder setSubText(java.lang.CharSequence); method public android.app.Notification.Builder setTicker(java.lang.CharSequence); @@ -28573,10 +28576,10 @@ package android.telecomm { field public static final android.os.Parcelable.Creator CREATOR; } - public abstract class InCallService { - ctor protected InCallService(); - method public final android.os.IBinder getBinder(); + public abstract class InCallService extends android.app.Service { + ctor public InCallService(); method public android.telecomm.Phone getPhone(); + method public android.os.IBinder onBind(android.content.Intent); method public void onPhoneCreated(android.telecomm.Phone); method public void onPhoneDestroyed(android.telecomm.Phone); } @@ -28608,7 +28611,7 @@ package android.telecomm { } public class PhoneAccountMetadata implements android.os.Parcelable { - ctor public PhoneAccountMetadata(android.telecomm.PhoneAccount, android.net.Uri, int, int, java.lang.String, java.lang.String, boolean); + ctor public PhoneAccountMetadata(android.telecomm.PhoneAccount, android.net.Uri, java.lang.String, int, int, java.lang.String, java.lang.String, boolean); method public int describeContents(); method public android.telecomm.PhoneAccount getAccount(); method public int getCapabilities(); @@ -28617,6 +28620,7 @@ package android.telecomm { method public int getIconResId(); method public java.lang.String getLabel(); method public java.lang.String getShortDescription(); + method public java.lang.String getSubscriptionNumber(); method public boolean isVideoCallingSupported(); method public void writeToParcel(android.os.Parcel, int); field public static final int CAPABILITY_CALL_PROVIDER = 2; // 0x2 @@ -28713,32 +28717,28 @@ package android.telecomm { field public static final android.os.Parcelable.Creator CREATOR; } - public final class TelecommConstants { - ctor public TelecommConstants(); + public class TelecommManager { + method public void clearAccounts(java.lang.String); + method public android.telecomm.PhoneAccount getDefaultOutgoingPhoneAccount(); + method public java.util.List<android.telecomm.PhoneAccount> getEnabledPhoneAccounts(); + method public android.telecomm.PhoneAccountMetadata getPhoneAccountMetadata(android.telecomm.PhoneAccount); + method public void registerPhoneAccount(android.telecomm.PhoneAccountMetadata); + method public void unregisterPhoneAccount(android.telecomm.PhoneAccount); field public static final java.lang.String ACTION_CONNECTION_SERVICE; field public static final java.lang.String ACTION_CONNECTION_SERVICE_CONFIGURE = "android.intent.action.CONNECTION_SERVICE_CONFIGURE"; field public static final java.lang.String ACTION_INCOMING_CALL = "android.intent.action.INCOMING_CALL"; field public static final char DTMF_CHARACTER_PAUSE = 44; // 0x002c ',' field public static final char DTMF_CHARACTER_WAIT = 59; // 0x003b ';' + field public static final java.lang.String EXTRA_CALL_BACK_NUMBER = "android.telecomm.extra.CALL_BACK_NUMBER"; field public static final java.lang.String EXTRA_CALL_DISCONNECT_CAUSE = "android.telecomm.extra.CALL_DISCONNECT_CAUSE"; field public static final java.lang.String EXTRA_CALL_DISCONNECT_MESSAGE = "android.telecomm.extra.CALL_DISCONNECT_MESSAGE"; field public static final java.lang.String EXTRA_CONNECTION_SERVICE = "android.telecomm.extra.CONNECTION_SERVICE"; - field public static final java.lang.String EXTRA_EMERGENCY_CALL_BACK_NUMBER = "android.telecomm.extra.EMERGENCY_CALL_BACK_NUMBER"; field public static final java.lang.String EXTRA_INCOMING_CALL_EXTRAS = "android.intent.extra.INCOMING_CALL_EXTRAS"; field public static final java.lang.String EXTRA_PHONE_ACCOUNT = "android.intent.extra.PHONE_ACCOUNT"; field public static final java.lang.String EXTRA_START_CALL_WITH_SPEAKERPHONE = "android.intent.extra.START_CALL_WITH_SPEAKERPHONE"; field public static final java.lang.String EXTRA_START_CALL_WITH_VIDEO_STATE = "android.intent.extra.START_CALL_WITH_VIDEO_STATE"; } - public class TelecommManager { - method public void clearAccounts(java.lang.String); - method public android.telecomm.PhoneAccount getDefaultOutgoingPhoneAccount(); - method public java.util.List<android.telecomm.PhoneAccount> getEnabledPhoneAccounts(); - method public android.telecomm.PhoneAccountMetadata getPhoneAccountMetadata(android.telecomm.PhoneAccount); - method public void registerPhoneAccount(android.telecomm.PhoneAccountMetadata); - method public void unregisterPhoneAccount(android.telecomm.PhoneAccount); - } - public class VideoCallProfile implements android.os.Parcelable { ctor public VideoCallProfile(int, int); method public int describeContents(); |