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

Commit 23b47813 authored by Aishwarya Mallampati's avatar Aishwarya Mallampati Committed by Android (Google) Code Review
Browse files

Merge "Add demo pointing aligned and not aligned duration configs." into 24D1-dev

parents 3f5e03ed d9c75871

core/res/res/values/config_telephony.xml

+18 −0
Original line number Diff line number Diff line
@@ -355,4 +355,22 @@ 
    </string-array>

    <java-symbol type="array" name="config_force_cellular_transport_capabilities" />



    <!-- The time duration in millis after which DemoSimulator will move to CONNECTED state from

         NOT_CONNECTED state if the device is aligned to satellite.

         -->

    <integer name="config_demo_pointing_aligned_duration_millis">15000</integer>

    <java-symbol type="integer" name="config_demo_pointing_aligned_duration_millis" />



    <!-- The time duration in millis after which DemoSimulator will move to NOT_CONNECTED state from

         CONNECTED state if the device is not aligned to satellite.

         -->

    <integer name="config_demo_pointing_not_aligned_duration_millis">30000</integer>

    <java-symbol type="integer" name="config_demo_pointing_not_aligned_duration_millis" />



    <!-- Boolean indicating whether Telephony should wait for device alignment with satellite

         before sending or receiving datagrams in demo mode.

         -->

    <bool name="config_wait_for_device_alignment_in_demo_datagram">false</bool>

    <java-symbol type="bool" name="config_wait_for_device_alignment_in_demo_datagram" />



</resources>

telephony/java/com/android/internal/telephony/ITelephony.aidl

+9 −0
Original line number Diff line number Diff line
@@ -3366,4 +3366,13 @@ interface ITelephony { 
            + "android.Manifest.permission.SATELLITE_COMMUNICATION)")

    void unregisterForCommunicationAllowedStateChanged(int subId,

            in ISatelliteCommunicationAllowedStateCallback callback);



    /**

     * This API can be used by only CTS to override the boolean configs used by the

     * DatagramController module.

     *

     * @param enable Whether to enable boolean config.

     * @return {@code true} if the boolean config is set successfully, {@code false} otherwise.

     */

    boolean setDatagramControllerBooleanConfig(boolean reset, int booleanType, boolean enable);

}