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

Commit 9464d4ab authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add TelephonyConfigManager flag for controlling whether satellite can... 

Merge "Add TelephonyConfigManager flag for controlling whether satellite can be disabled while enabling in progress" into main
parents c6f1535b f5dc3420

core/res/res/values/config_telephony.xml

+5 −0
Original line number Diff line number Diff line
@@ -318,6 +318,11 @@ 
    <bool name="config_send_satellite_datagram_to_modem_in_demo_mode">false</bool>

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



    <!-- Whether the device supports disabling satellite while satellite enabling is in progress.

         -->

    <bool name="config_support_disable_satellite_while_enable_in_progress">true</bool>

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



    <!-- List of country codes where oem-enabled satellite services are either allowed or disallowed

         by the device. Each country code is a lowercase 2 character ISO-3166-1 alpha-2.

         -->

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

+10 −0
Original line number Diff line number Diff line
@@ -3134,6 +3134,16 @@ interface ITelephony { 
     */

    boolean setSatelliteIgnoreCellularServiceState(in boolean enabled);



    /**

     * This API can be used by only CTS to control the feature

     * {@code config_support_disable_satellite_while_enable_in_progress}.

     *

     * @param reset Whether to reset the override.

     * @param supported Whether to support the feature.

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

     */

    boolean setSupportDisableSatelliteWhileEnableInProgress(boolean reset, boolean supported);



    /**

     * This API can be used by only CTS to update satellite pointing UI app package and class names.

     *