diff options
| author | 2025-03-20 03:55:48 -0700 | |
|---|---|---|
| committer | 2025-03-20 03:55:48 -0700 | |
| commit | 9464d4ab2b61755da8729b924077a7abddf6cc7a (patch) | |
| tree | 1bcb953cf972e9305d6cc7f95ddad392c706d53c | |
| parent | c6f1535bf2224dd6d3a839a3280a4a9cd097ce6f (diff) | |
| parent | f5dc342079e38d302096fd4812c72011991032c4 (diff) | |
Merge "Add TelephonyConfigManager flag for controlling whether satellite can be disabled while enabling in progress" into main
| -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 1d40110dc7ca..fc46418478c8 100644 --- a/core/res/res/values/config_telephony.xml +++ b/core/res/res/values/config_telephony.xml @@ -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. --> diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl index d7f80a94081a..2095ee83b77d 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. |