Merge "More telephony updates for mainline." (4857c1f9) · Commits · e / os / android_frameworks_base

api/current.txt

+6 −0

Original line number	Diff line number	Diff line
		@@ -37122,6 +37122,7 @@ package android.provider {
		field public static final String DURATION = "duration";
		field public static final String EXTRA_CALL_TYPE_FILTER = "android.provider.extra.CALL_TYPE_FILTER";
		field public static final String FEATURES = "features";
		field public static final int FEATURES_ASSISTED_DIALING_USED = 16; // 0x10
		field public static final int FEATURES_HD_CALL = 4; // 0x4
		field public static final int FEATURES_PULLED_EXTERNALLY = 2; // 0x2
		field public static final int FEATURES_RTT = 32; // 0x20
		@@ -43394,6 +43395,7 @@ package android.telecom {
		field public static final int DIRECTION_INCOMING = 0; // 0x0
		field public static final int DIRECTION_OUTGOING = 1; // 0x1
		field public static final int DIRECTION_UNKNOWN = -1; // 0xffffffff
		field public static final int PROPERTY_ASSISTED_DIALING_USED = 512; // 0x200
		field public static final int PROPERTY_CONFERENCE = 1; // 0x1
		field public static final int PROPERTY_EMERGENCY_CALLBACK_MODE = 4; // 0x4
		field public static final int PROPERTY_ENTERPRISE_CALL = 32; // 0x20
		@@ -43507,6 +43509,7 @@ package android.telecom {
		method public final void removeConnection(android.telecom.Connection);
		method public final void removeExtras(java.util.List<java.lang.String>);
		method public final void removeExtras(java.lang.String...);
		method public void sendConferenceEvent(@NonNull String, @Nullable android.os.Bundle);
		method public final void setActive();
		method public final void setConferenceableConnections(java.util.List<android.telecom.Connection>);
		method public final void setConnectionCapabilities(int);
		@@ -43646,6 +43649,7 @@ package android.telecom {
		field public static final String EXTRA_IS_RTT_AUDIO_PRESENT = "android.telecom.extra.IS_RTT_AUDIO_PRESENT";
		field public static final String EXTRA_LAST_FORWARDED_NUMBER = "android.telecom.extra.LAST_FORWARDED_NUMBER";
		field public static final String EXTRA_SIP_INVITE = "android.telecom.extra.SIP_INVITE";
		field public static final int PROPERTY_ASSISTED_DIALING_USED = 512; // 0x200
		field public static final int PROPERTY_HAS_CDMA_VOICE_PRIVACY = 32; // 0x20
		field public static final int PROPERTY_HIGH_DEF_AUDIO = 4; // 0x4
		field public static final int PROPERTY_IS_EXTERNAL_CALL = 16; // 0x10
		@@ -44060,6 +44064,7 @@ package android.telecom {
		method public android.telecom.PhoneAccount getPhoneAccount(android.telecom.PhoneAccountHandle);
		method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public java.util.List<android.telecom.PhoneAccountHandle> getSelfManagedPhoneAccounts();
		method public android.telecom.PhoneAccountHandle getSimCallManager();
		method @Nullable public android.telecom.PhoneAccountHandle getSimCallManagerForSubscription(int);
		method @Nullable public String getSystemDialerPackage();
		method @Nullable @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public android.telecom.PhoneAccountHandle getUserSelectedOutgoingPhoneAccount();
		method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public String getVoiceMailNumber(android.telecom.PhoneAccountHandle);
		@@ -44108,6 +44113,7 @@ package android.telecom {
		field public static final String EXTRA_START_CALL_WITH_RTT = "android.telecom.extra.START_CALL_WITH_RTT";
		field public static final String EXTRA_START_CALL_WITH_SPEAKERPHONE = "android.telecom.extra.START_CALL_WITH_SPEAKERPHONE";
		field public static final String EXTRA_START_CALL_WITH_VIDEO_STATE = "android.telecom.extra.START_CALL_WITH_VIDEO_STATE";
		field public static final String EXTRA_USE_ASSISTED_DIALING = "android.telecom.extra.USE_ASSISTED_DIALING";
		field public static final String GATEWAY_ORIGINAL_ADDRESS = "android.telecom.extra.GATEWAY_ORIGINAL_ADDRESS";
		field public static final String GATEWAY_PROVIDER_PACKAGE = "android.telecom.extra.GATEWAY_PROVIDER_PACKAGE";
		field public static final String METADATA_INCLUDE_EXTERNAL_CALLS = "android.telecom.INCLUDE_EXTERNAL_CALLS";

api/system-current.txt

+14 −2

Original line number	Diff line number	Diff line
		@@ -7243,14 +7243,18 @@ package android.telecom {
		public abstract class Conference extends android.telecom.Conferenceable {
		method @Deprecated public final android.telecom.AudioState getAudioState();
		method @Deprecated public final long getConnectTimeMillis();
		method public final long getConnectionStartElapsedRealTime();
		method public android.telecom.Connection getPrimaryConnection();
		method @NonNull public final String getTelecomCallId();
		method @Deprecated public void onAudioStateChanged(android.telecom.AudioState);
		method public final void setAddress(@NonNull android.net.Uri, int);
		method public final void setCallerDisplayName(@NonNull String, int);
		method public void setConferenceState(boolean);
		method @Deprecated public final void setConnectTimeMillis(long);
		}

		public abstract class Connection extends android.telecom.Conferenceable {
		method @Deprecated public final android.telecom.AudioState getAudioState();
		method public final int getCallRadioTech();
		method public final long getConnectElapsedTimeMillis();
		method public final long getConnectTimeMillis();
		method @Nullable public android.telecom.PhoneAccountHandle getPhoneAccountHandle();
		@@ -7258,7 +7262,6 @@ package android.telecom {
		method @Deprecated public void onAudioStateChanged(android.telecom.AudioState);
		method public final void resetConnectionTime();
		method public void setCallDirection(int);
		method public final void setCallRadioTech(int);
		method public final void setConnectTimeMillis(long);
		method public final void setConnectionStartElapsedRealTime(long);
		method public void setPhoneAccountHandle(@NonNull android.telecom.PhoneAccountHandle);
		@@ -7272,6 +7275,10 @@ package android.telecom {
		field public static final int PROPERTY_REMOTELY_HOSTED = 2048; // 0x800
		}

		public abstract class ConnectionService extends android.app.Service {
		method public final void addExistingConnection(@NonNull android.telecom.PhoneAccountHandle, @NonNull android.telecom.Connection, @NonNull android.telecom.Conference);
		}

		public abstract class InCallService extends android.app.Service {
		method @Deprecated public android.telecom.Phone getPhone();
		method @Deprecated public void onPhoneCreated(android.telecom.Phone);
		@@ -7403,6 +7410,10 @@ package android.telecom {
		field public static final int CAPABILITY_MULTI_USER = 32; // 0x20
		}

		public static class PhoneAccount.Builder {
		method @NonNull public android.telecom.PhoneAccount.Builder setGroupId(@NonNull String);
		}

		public class PhoneAccountSuggestionService extends android.app.Service {
		ctor public PhoneAccountSuggestionService();
		method public void onAccountSuggestionRequest(@NonNull String);
		@@ -7474,6 +7485,7 @@ package android.telecom {
		method public int getCallState();
		method public android.telecom.PhoneAccountHandle getConnectionManager();
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getCurrentTtyMode();
		method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getDefaultDialerPackage(int);
		method @Deprecated public android.content.ComponentName getDefaultPhoneApp();
		method public java.util.List<android.telecom.PhoneAccountHandle> getPhoneAccountsForPackage();
		method @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public java.util.List<android.telecom.PhoneAccountHandle> getPhoneAccountsSupportingScheme(String);

api/test-current.txt

+30 −0

Original line number	Diff line number	Diff line
		@@ -2914,7 +2914,36 @@ package android.telecom {
		}

		public abstract class Conference extends android.telecom.Conferenceable {
		method public final long getConnectionStartElapsedRealTime();
		method public android.telecom.Connection getPrimaryConnection();
		method @NonNull public final String getTelecomCallId();
		method public final void setAddress(@NonNull android.net.Uri, int);
		method public final void setCallerDisplayName(@NonNull String, int);
		method public void setConferenceState(boolean);
		}

		public abstract class Connection extends android.telecom.Conferenceable {
		method public final long getConnectElapsedTimeMillis();
		method public final long getConnectTimeMillis();
		method @Nullable public android.telecom.PhoneAccountHandle getPhoneAccountHandle();
		method @Nullable public final String getTelecomCallId();
		method public final void resetConnectionTime();
		method public void setCallDirection(int);
		method public final void setConnectTimeMillis(long);
		method public final void setConnectionStartElapsedRealTime(long);
		method public void setPhoneAccountHandle(@NonNull android.telecom.PhoneAccountHandle);
		method public void setTelecomCallId(@NonNull String);
		field public static final int CAPABILITY_CONFERENCE_HAS_NO_CHILDREN = 2097152; // 0x200000
		field public static final int CAPABILITY_SPEED_UP_MT_AUDIO = 262144; // 0x40000
		field public static final String EXTRA_DISABLE_ADD_CALL = "android.telecom.extra.DISABLE_ADD_CALL";
		field public static final int PROPERTY_EMERGENCY_CALLBACK_MODE = 1; // 0x1
		field public static final int PROPERTY_GENERIC_CONFERENCE = 2; // 0x2
		field public static final int PROPERTY_IS_DOWNGRADED_CONFERENCE = 64; // 0x40
		field public static final int PROPERTY_REMOTELY_HOSTED = 2048; // 0x800
		}

		public static class PhoneAccount.Builder {
		method @NonNull public android.telecom.PhoneAccount.Builder setGroupId(@NonNull String);
		}

		public class PhoneAccountSuggestionService extends android.app.Service {
		@@ -2927,6 +2956,7 @@ package android.telecom {

		public class TelecomManager {
		method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public int getCurrentTtyMode();
		method @Nullable @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public String getDefaultDialerPackage(int);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean isInEmergencyCall();
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setUserSelectedOutgoingPhoneAccount(@Nullable android.telecom.PhoneAccountHandle);
		field public static final int TTY_MODE_FULL = 1; // 0x1

core/java/android/provider/CallLog.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -227,7 +227,7 @@ public class CallLog {

		/**
		* Indicates the call underwent Assisted Dialing.
		* @hide
		* @see TelecomManager#EXTRA_USE_ASSISTED_DIALING
		*/
		public static final int FEATURES_ASSISTED_DIALING_USED = 1 << 4;

telecomm/java/android/telecom/Call.java

+6 −4

Original line number	Diff line number	Diff line
		@@ -512,8 +512,8 @@ public final class Call {

		/**
		* Indicates the call used Assisted Dialing.
		* See also {@link Connection#PROPERTY_ASSISTED_DIALING_USED}
		* @hide
		*
		* @see TelecomManager#EXTRA_USE_ASSISTED_DIALING
		*/
		public static final int PROPERTY_ASSISTED_DIALING_USED = 0x00000200;

		@@ -1181,7 +1181,8 @@ public final class Call {
		public void onConferenceableCallsChanged(Call call, List<Call> conferenceableCalls) {}

		/**
		* Invoked when a {@link Call} receives an event from its associated {@link Connection}.
		* Invoked when a {@link Call} receives an event from its associated {@link Connection} or
		* {@link Conference}.
		* <p>
		* Where possible, the Call should make an attempt to handle {@link Connection} events which
		* are part of the {@code android.telecom.*} namespace. The Call should ignore any events
		@@ -1189,7 +1190,8 @@ public final class Call {
		* possible that a {@link ConnectionService} has defined its own Connection events which a
		* Call is not aware of.
		* <p>
		* See {@link Connection#sendConnectionEvent(String, Bundle)}.
		* See {@link Connection#sendConnectionEvent(String, Bundle)},
		* {@link Conference#sendConferenceEvent(String, Bundle)}.
		*
		* @param call The {@code Call} receiving the event.
		* @param event The event.