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

Commit 1b726199 authored by Hall Liu's avatar Hall Liu Committed by android-build-merger
Browse files

Merge "Add setting and logging for RTT" am: b823d08d 

am: 1c2da9f9

Change-Id: Ic5ab105e5b2c3ad3866bee4d7dd5a6d8427adc74
parents 7c24845a 1c2da9f9

core/java/android/provider/Settings.java

+16 −0
Original line number Diff line number Diff line
@@ -3670,6 +3670,20 @@ public final class Settings { 
        /** @hide */

        public static final Validator TTY_MODE_VALIDATOR = new InclusiveIntegerRangeValidator(0, 3);



        /**

         * User-selected RTT mode

         * 0 = OFF

         * 1 = FULL

         * 2 = VCO

         * 3 = HCO

         * Uses the same constants as TTY (e.g. {@link android.telecom.TelecomManager#TTY_MODE_OFF})

         * @hide

         */

        public static final String RTT_CALLING_MODE = "rtt_calling_mode";



        /** @hide */

        public static final Validator RTT_CALLING_MODE_VALIDATOR = TTY_MODE_VALIDATOR;



        /**

         * Whether the sounds effects (key clicks, lid open ...) are enabled. The value is

         * boolean (1 or 0).
@@ -3990,6 +4004,7 @@ public final class Settings { 
            DTMF_TONE_WHEN_DIALING,

            DTMF_TONE_TYPE_WHEN_DIALING,

            HEARING_AID,

            RTT_CALLING_MODE,

            TTY_MODE,

            MASTER_MONO,

            SOUND_EFFECTS_ENABLED,
@@ -4173,6 +4188,7 @@ public final class Settings { 
            VALIDATORS.put(DTMF_TONE_TYPE_WHEN_DIALING, DTMF_TONE_TYPE_WHEN_DIALING_VALIDATOR);

            VALIDATORS.put(HEARING_AID, HEARING_AID_VALIDATOR);

            VALIDATORS.put(TTY_MODE, TTY_MODE_VALIDATOR);

            VALIDATORS.put(RTT_CALLING_MODE, RTT_CALLING_MODE_VALIDATOR);

            VALIDATORS.put(NOTIFICATION_LIGHT_PULSE, NOTIFICATION_LIGHT_PULSE_VALIDATOR);

            VALIDATORS.put(POINTER_LOCATION, POINTER_LOCATION_VALIDATOR);

            VALIDATORS.put(SHOW_TOUCHES, SHOW_TOUCHES_VALIDATOR);

telecomm/java/android/telecom/Connection.java

+5 −0
Original line number Diff line number Diff line
@@ -796,6 +796,10 @@ public abstract class Connection extends Conferenceable { 
            builder.append(isLong ? " PROPERTY_HAS_CDMA_VOICE_PRIVACY" : " priv");

        }



        if (can(properties, PROPERTY_IS_RTT)) {

            builder.append(isLong ? " PROPERTY_IS_RTT" : " rtt");

        }



        builder.append("]");

        return builder.toString();

    }
@@ -2649,6 +2653,7 @@ public abstract class Connection extends Conferenceable { 
     */

    @TestApi

    public final void sendRttSessionRemotelyTerminated() {

        unsetRttProperty();

        mListeners.forEach((l) -> l.onRttSessionRemotelyTerminated(Connection.this));

    }