Merge "Hide Adhoc conference call API." (32c29d1e) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −11

Original line number	Diff line number	Diff line
		@@ -43690,7 +43690,6 @@ package android.telecom {
		field public static final int PROPERTY_GENERIC_CONFERENCE = 2; // 0x2
		field public static final int PROPERTY_HAS_CDMA_VOICE_PRIVACY = 128; // 0x80
		field public static final int PROPERTY_HIGH_DEF_AUDIO = 16; // 0x10
		field public static final int PROPERTY_IS_ADHOC_CONFERENCE = 8192; // 0x2000
		field public static final int PROPERTY_IS_EXTERNAL_CALL = 64; // 0x40
		field public static final int PROPERTY_NETWORK_IDENTIFIED_EMERGENCY_CALL = 2048; // 0x800
		field public static final int PROPERTY_RTT = 1024; // 0x400
		@@ -43768,7 +43767,6 @@ package android.telecom {
		public abstract class Conference extends android.telecom.Conferenceable {
		ctor public Conference(android.telecom.PhoneAccountHandle);
		method public final boolean addConnection(android.telecom.Connection);
		method @NonNull public static android.telecom.Conference createFailedConference(@NonNull android.telecom.DisconnectCause, @NonNull android.telecom.PhoneAccountHandle);
		method public final void destroy();
		method public final android.telecom.CallAudioState getCallAudioState();
		method public final java.util.List<android.telecom.Connection> getConferenceableConnections();
		@@ -43783,8 +43781,6 @@ package android.telecom {
		method public final android.telecom.StatusHints getStatusHints();
		method public android.telecom.Connection.VideoProvider getVideoProvider();
		method public int getVideoState();
		method public final boolean isRingbackRequested();
		method public void onAnswer(int);
		method public void onCallAudioStateChanged(android.telecom.CallAudioState);
		method public void onConnectionAdded(android.telecom.Connection);
		method public void onDisconnect();
		@@ -43793,7 +43789,6 @@ package android.telecom {
		method public void onMerge(android.telecom.Connection);
		method public void onMerge();
		method public void onPlayDtmfTone(char);
		method public void onReject();
		method public void onSeparate(android.telecom.Connection);
		method public void onStopDtmfTone();
		method public void onSwap();
		@@ -43813,8 +43808,6 @@ package android.telecom {
		method public final void setDisconnected(android.telecom.DisconnectCause);
		method public final void setExtras(@Nullable android.os.Bundle);
		method public final void setOnHold();
		method public final void setRingbackRequested(boolean);
		method public final void setRinging();
		method public final void setStatusHints(android.telecom.StatusHints);
		method public final void setVideoProvider(android.telecom.Connection, android.telecom.Connection.VideoProvider);
		method public final void setVideoState(android.telecom.Connection, int);
		@@ -43973,7 +43966,6 @@ package android.telecom {
		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_ADHOC_CONFERENCE = 4096; // 0x1000
		field public static final int PROPERTY_IS_EXTERNAL_CALL = 16; // 0x10
		field public static final int PROPERTY_IS_RTT = 256; // 0x100
		field public static final int PROPERTY_NETWORK_IDENTIFIED_EMERGENCY_CALL = 1024; // 0x400
		@@ -44386,7 +44378,6 @@ package android.telecom {
		method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.ANSWER_PHONE_CALLS, android.Manifest.permission.MODIFY_PHONE_STATE}) public void acceptRingingCall();
		method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.ANSWER_PHONE_CALLS, android.Manifest.permission.MODIFY_PHONE_STATE}) public void acceptRingingCall(int);
		method public void addNewIncomingCall(android.telecom.PhoneAccountHandle, android.os.Bundle);
		method public void addNewIncomingConference(@NonNull android.telecom.PhoneAccountHandle, @NonNull android.os.Bundle);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void cancelMissedCallsNotification();
		method public android.content.Intent createManageBlockedNumbersIntent();
		method @Deprecated @RequiresPermission(android.Manifest.permission.ANSWER_PHONE_CALLS) public boolean endCall();
		@@ -44414,7 +44405,6 @@ package android.telecom {
		method public void registerPhoneAccount(android.telecom.PhoneAccount);
		method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public void showInCallScreen(boolean);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void silenceRinger();
		method @RequiresPermission(android.Manifest.permission.CALL_PHONE) public void startConference(@NonNull java.util.List<android.net.Uri>, @NonNull android.os.Bundle);
		method public void unregisterPhoneAccount(android.telecom.PhoneAccountHandle);
		field public static final String ACTION_CHANGE_DEFAULT_DIALER = "android.telecom.action.CHANGE_DEFAULT_DIALER";
		field public static final String ACTION_CHANGE_PHONE_ACCOUNTS = "android.telecom.action.CHANGE_PHONE_ACCOUNTS";
		@@ -44906,7 +44896,6 @@ package android.telephony {
		field public static final String KEY_SIM_NETWORK_UNLOCK_ALLOW_DISMISS_BOOL = "sim_network_unlock_allow_dismiss_bool";
		field public static final String KEY_SMS_REQUIRES_DESTINATION_NUMBER_CONVERSION_BOOL = "sms_requires_destination_number_conversion_bool";
		field public static final String KEY_SUPPORT_3GPP_CALL_FORWARDING_WHILE_ROAMING_BOOL = "support_3gpp_call_forwarding_while_roaming_bool";
		field public static final String KEY_SUPPORT_ADHOC_CONFERENCE_CALLS_BOOL = "support_adhoc_conference_calls_bool";
		field public static final String KEY_SUPPORT_CLIR_NETWORK_DEFAULT_BOOL = "support_clir_network_default_bool";
		field public static final String KEY_SUPPORT_CONFERENCE_CALL_BOOL = "support_conference_call_bool";
		field public static final String KEY_SUPPORT_EMERGENCY_SMS_OVER_IMS_BOOL = "support_emergency_sms_over_ims_bool";

telecomm/java/android/telecom/Call.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -573,6 +573,7 @@ public final class Call {
		/**
		* Indicates that the call is an adhoc conference call. This property can be set for both
		* incoming and outgoing calls.
		* @hide
		*/
		public static final int PROPERTY_IS_ADHOC_CONFERENCE = 0x00002000;

telecomm/java/android/telecom/Conference.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -174,6 +174,7 @@ public abstract class Conference extends Conferenceable {
		/**
		* Returns whether this conference is requesting that the system play a ringback tone
		* on its behalf.
		* @hide
		*/
		public final boolean isRingbackRequested() {
		return mRingbackRequested;
		@@ -324,6 +325,7 @@ public abstract class Conference extends Conferenceable {
		* the default dialer's {@link InCallService}.
		*
		* @param videoState The video state in which to answer the connection.
		* @hide
		*/
		public void onAnswer(int videoState) {}

		@@ -343,6 +345,7 @@ public abstract class Conference extends Conferenceable {
		* a request to reject.
		* For managed {@link ConnectionService}s, this will be called when the user rejects a call via
		* the default dialer's {@link InCallService}.
		* @hide
		*/
		public void onReject() {}

		@@ -362,6 +365,7 @@ public abstract class Conference extends Conferenceable {

		/**
		* Sets state to be ringing.
		* @hide
		*/
		public final void setRinging() {
		setState(Connection.STATE_RINGING);
		@@ -487,6 +491,7 @@ public abstract class Conference extends Conferenceable {
		* that do not play a ringback tone themselves in the conference's audio stream.
		*
		* @param ringback Whether the ringback tone is to be played.
		* @hide
		*/
		public final void setRingbackRequested(boolean ringback) {
		if (mRingbackRequested != ringback) {
		@@ -736,6 +741,7 @@ public abstract class Conference extends Conferenceable {
		*
		* @param disconnectCause The disconnect cause, ({@see android.telecomm.DisconnectCause}).
		* @return A {@code Conference} which indicates failure.
		* @hide
		*/
		public @NonNull static Conference createFailedConference(
		@NonNull DisconnectCause disconnectCause, @NonNull PhoneAccountHandle phoneAccount) {

telecomm/java/android/telecom/Connection.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -501,7 +501,7 @@ public abstract class Connection extends Conferenceable {
		* Set by the framework to indicate that it is an adhoc conference call.
		* <p>
		* This is used for Outgoing and incoming conference calls.
		*
		* @hide
		*/
		public static final int PROPERTY_IS_ADHOC_CONFERENCE = 1 << 12;

telecomm/java/android/telecom/TelecomManager.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -1827,8 +1827,8 @@ public class TelecomManager {
		* {@link #registerPhoneAccount}.
		* @param extras A bundle that will be passed through to
		* {@link ConnectionService#onCreateIncomingConference}.
		* @hide
		*/

		public void addNewIncomingConference(@NonNull PhoneAccountHandle phoneAccount,
		@NonNull Bundle extras) {
		try {
		@@ -2066,6 +2066,7 @@ public class TelecomManager {
		*
		* @param participants List of participants to start conference with
		* @param extras Bundle of extras to use with the call
		* @hide
		*/
		@RequiresPermission(android.Manifest.permission.CALL_PHONE)
		public void startConference(@NonNull List<Uri> participants,