diff options
| author | 2025-03-19 13:42:14 -0700 | |
|---|---|---|
| committer | 2025-03-19 13:42:14 -0700 | |
| commit | f5dc342079e38d302096fd4812c72011991032c4 (patch) | |
| tree | 080d17c1a91925cd5563425e21c503bae0b4136c | |
| parent | 99c323bf869e6c83966225896e9002b753817903 (diff) | |
Add TelephonyConfigManager flag for controlling whether satellite can be disabled while enabling in progress
This CL defines a new config_support_disable_satellite_while_enable_in_progress flag which can be used to control whether the modem allows disabling satellite mode while it is enabling.
If the flag is disabled, the modem will ignore any request to disable satellite mode when it is enabling. If the flag is enabled, the modem will allow satellite mode to be disabled as long as the enable request has not been sent to the HAL.
The default value for the flag is false.
Flag: EXEMPT bugfix
Bug: 396157049
Test: SatelliteManagerTestOnMockService SatelliteControllerTest
Manual system tests
Change-Id: I80b06378b1eefbefb377f72abab39446a48bd2d6
| -rw-r--r-- | core/res/res/values/config_telephony.xml | 5 | ||||
| -rw-r--r-- | telephony/java/com/android/internal/telephony/ITelephony.aidl | 10 |
2 files changed, 15 insertions, 0 deletions
diff --git a/core/res/res/values/config_telephony.xml b/core/res/res/values/config_telephony.xml index 849ca2882889..92eb5f98f2a9 100644 --- a/core/res/res/values/config_telephony.xml +++ b/core/res/res/values/config_telephony.xml @@ -303,6 +303,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. --> diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl index b8aa9e8646bd..c23f4ebd4928 100644 --- a/telephony/java/com/android/internal/telephony/ITelephony.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl @@ -3135,6 +3135,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. * * @param packageName The package name of the satellite pointing UI app. |