Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c62ef09 authored by Tyler Gunn's avatar Tyler Gunn
Browse files

Mark adhoc conference call APIs as @hide. 

Test: make -j update-api
Test: Run unit tests
Bug: 62151032
Change-Id: I8fe9c4d2c9a8861deea3a0def82c432762cd1222
parent 404babbb

api/current.txt

+0 −6
Original line number Diff line number Diff line
@@ -43553,7 +43553,6 @@ package android.system { 
package android.telecom {















  public final class Call {













    method public void addConferenceParticipants(@NonNull java.util.List<android.net.Uri>);















    method public void answer(int);















    method public void conference(android.telecom.Call);















    method public void deflect(android.net.Uri);










@@ -43662,7 +43661,6 @@ package android.telecom {













    method public static boolean hasProperty(int, int);















    method public boolean hasProperty(int);















    method public static String propertiesToString(int);













    field public static final int CAPABILITY_ADD_PARTICIPANT = 33554432; // 0x2000000















    field public static final int CAPABILITY_CANNOT_DOWNGRADE_VIDEO_TO_AUDIO = 4194304; // 0x400000















    field public static final int CAPABILITY_CAN_PAUSE_VIDEO = 1048576; // 0x100000















    field public static final int CAPABILITY_CAN_PULL_CALL = 8388608; // 0x800000










@@ -43783,7 +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 void onAddConferenceParticipants(@NonNull java.util.List<android.net.Uri>);















    method public void onCallAudioStateChanged(android.telecom.CallAudioState);















    method public void onConnectionAdded(android.telecom.Connection);















    method public void onDisconnect();










@@ -43847,7 +43844,6 @@ package android.telecom {













    method public final boolean isRingbackRequested();















    method public final void notifyConferenceMergeFailed();















    method public void onAbort();













    method public void onAddConferenceParticipants(@NonNull java.util.List<android.net.Uri>);















    method public void onAnswer(int);















    method public void onAnswer();















    method public void onCallAudioStateChanged(android.telecom.CallAudioState);










@@ -43927,7 +43923,6 @@ package android.telecom {













    field public static final int AUDIO_CODEC_GSM_HR = 10; // 0xa















    field public static final int AUDIO_CODEC_NONE = 0; // 0x0















    field public static final int AUDIO_CODEC_QCELP13K = 3; // 0x3













    field public static final int CAPABILITY_ADD_PARTICIPANT = 67108864; // 0x4000000















    field public static final int CAPABILITY_CANNOT_DOWNGRADE_VIDEO_TO_AUDIO = 8388608; // 0x800000















    field public static final int CAPABILITY_CAN_PAUSE_VIDEO = 1048576; // 0x100000















    field public static final int CAPABILITY_CAN_PULL_CALL = 16777216; // 0x1000000










@@ -44901,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_ADD_CONFERENCE_PARTICIPANTS_BOOL = "support_add_conference_participants_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



+6
−1




























Original line number
Diff line number
Diff line








@@ -459,7 +459,11 @@ public final class Call {













        /** Call supports the deflect feature. */















        public static final int CAPABILITY_SUPPORT_DEFLECT = 0x01000000;





























        /** call supports adding participants to existing call */













        /**













         * Call supports adding participants to the call via













         * {@link #addConferenceParticipants(List)}.













         * @hide













         */















        public static final int CAPABILITY_ADD_PARTICIPANT = 0x02000000;















        //******************************************************************************************















        // Next CAPABILITY value: 0x04000000










@@ -1713,6 +1717,7 @@ public final class Call {













     * See {@link Details#CAPABILITY_ADD_PARTICIPANT}.















     *















     * @param participants participants to be pulled to existing call.













     * @hide















     */















    public void addConferenceParticipants(@NonNull List<Uri> participants) {















        mInCallAdapter.addConferenceParticipants(mTelecomCallId, participants);

































telecomm/java/android/telecom/Conference.java



+3
−2




























Original line number
Diff line number
Diff line








@@ -319,8 +319,9 @@ public abstract class Conference extends Conferenceable {













    public void onConnectionAdded(Connection connection) {}































    /**













     * Notifies the {@link Conference} of a request to add a new participant to the conference call













     * @param participants that will be added to existing conference call













     * Notifies the {@link Conference} of a request to add a new participants to the conference call













     * @param participants that will be added to this conference call













     * @hide















     */















    public void onAddConferenceParticipants(@NonNull List<Uri> participants) {}

















































telecomm/java/android/telecom/Connection.java



+4
−2




























Original line number
Diff line number
Diff line








@@ -378,7 +378,8 @@ public abstract class Connection extends Conferenceable {





























    /**















     * When set, indicates that this {@link Connection} supports initiation of a conference call













     * by directly adding a participant using {@link #onAddConferenceParticipants()}.













     * by directly adding participants using {@link #onAddConferenceParticipants(List)}.













     * @hide















     */















    public static final int CAPABILITY_ADD_PARTICIPANT = 0x04000000;















    //**********************************************************************************************










@@ -2960,9 +2961,10 @@ public abstract class Connection extends Conferenceable {













    public void onSeparate() {}































    /**













     * Supports initiation of a conference call by directly adding participants.













     * Supports initiation of a conference call by directly adding participants to an ongoing call.















     *















     * @param participants with which conference call will be formed.













     * @hide















     */















    public void onAddConferenceParticipants(@NonNull List<Uri> participants) {}

















































telephony/java/android/telephony/CarrierConfigManager.java



+1
−0




























Original line number
Diff line number
Diff line








@@ -1091,6 +1091,7 @@ public class CarrierConfigManager {













    /**















     * Determines whether conference participants can be added to existing call.  When {@code true},















     * adding conference participants to existing call is supported, {@code false otherwise}.













     * @hide















     */















    public static final String KEY_SUPPORT_ADD_CONFERENCE_PARTICIPANTS_BOOL =















            "support_add_conference_participants_bool";