From 0051106f6ac5c4d15f850e1917eed08bf2e258a8 Mon Sep 17 00:00:00 2001 From: chen xu Date: Tue, 2 Jul 2019 16:32:07 -0700 Subject: [PATCH] support limited sim function notification under dsds warn users that sim voice & data function might be limited during DSDS due to sharing the same radio. this is controlled by carrier config, carrier which provide emergency service can choose to notify users that their service might be impacted under certain dual sim scenarios. Bug: 134790138 Test: Manual Change-Id: I8ae33fc9d775b9654587f0e863a51115ca6065db --- core/res/res/values/strings.xml | 3 +++ core/res/res/values/symbols.xml | 1 + .../java/android/telephony/CarrierConfigManager.java | 10 ++++++++++ 3 files changed, 14 insertions(+) diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 76f2e7bd97928..0f6b4a7e5063c 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -187,6 +187,9 @@ Wi-Fi calling SIM status + + High priority SIM status + Peer requested TTY Mode FULL diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 8b14da5e948ae..96a1e2541c61b 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -647,6 +647,7 @@ + diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 9806199003d78..28d5033156a64 100755 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -2112,6 +2112,15 @@ public class CarrierConfigManager { public static final String KEY_DATA_WARNING_NOTIFICATION_BOOL = "data_warning_notification_bool"; + /** + * Controls if the device should automatically warn the user that sim voice & data function + * might be limited due to dual sim scenario. When set to {@true} display the notification, + * {@code false} otherwise. + * @hide + */ + public static final String KEY_LIMITED_SIM_FUNCTION_NOTIFICATION_FOR_DSDS_BOOL = + "limited_sim_function_notification_for_dsds_bool"; + /** * Controls the cellular data limit. *

@@ -3260,6 +3269,7 @@ public class CarrierConfigManager { sDefaults.putInt(KEY_MONTHLY_DATA_CYCLE_DAY_INT, DATA_CYCLE_USE_PLATFORM_DEFAULT); sDefaults.putLong(KEY_DATA_WARNING_THRESHOLD_BYTES_LONG, DATA_CYCLE_USE_PLATFORM_DEFAULT); sDefaults.putBoolean(KEY_DATA_WARNING_NOTIFICATION_BOOL, true); + sDefaults.putBoolean(KEY_LIMITED_SIM_FUNCTION_NOTIFICATION_FOR_DSDS_BOOL, false); sDefaults.putLong(KEY_DATA_LIMIT_THRESHOLD_BYTES_LONG, DATA_CYCLE_USE_PLATFORM_DEFAULT); sDefaults.putBoolean(KEY_DATA_LIMIT_NOTIFICATION_BOOL, true); sDefaults.putBoolean(KEY_DATA_RAPID_NOTIFICATION_BOOL, true);