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

Commit 50911554 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "IMS: Clean up Conference URI system property."

parents d779d340 0b76c9e8

telecomm/java/android/telecom/PhoneCapabilities.java

+3 −0
Original line number Diff line number Diff line
@@ -157,6 +157,9 @@ public final class PhoneCapabilities { 
        if ((capabilities & CALL_TYPE_MODIFIABLE) != 0) {

            builder.append(" CALL_TYPE_MODIFIABLE");

        }

        if ((capabilities & ADD_PARTICIPANT) != 0) {

            builder.append(" ADD_PARTICIPANT");

        }



        builder.append("]");

        return builder.toString();

telephony/java/com/android/internal/telephony/TelephonyProperties.java

+0 −8
Original line number Diff line number Diff line
@@ -227,14 +227,6 @@ public interface TelephonyProperties 
     */

    static final String PROPERTY_SIM_COUNT = "ro.telephony.sim.count";



    /**

     * Enable VoLTE/VT over IMS: debug option

     * If 1: use IMS if provisioned/registered etc (i.e. standard operation)

     * If 0: use CS.

     * If missing: use 0

     */

    static final String PROPERTY_DBG_IMS_VOLTE_ENABLE = "persist.dbg.ims_volte_enable";



    static final String EXTRAS_IS_CONFERENCE_URI = "isConferenceUri";



    static final String EXTRA_DIAL_CONFERENCE_URI =