Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "support limited sim function notification under dsds" into qt-r1-dev

Browse Source 
am: fed8ece4e1

Change-Id: Iaae22ceea1ac87d1e4de7c6d15a53655d6faae46
This commit is contained in:
Chen Xu
2019-07-29 13:25:37 -07:00
committed by android-build-merger
parent 5b921e763b fed8ece4e1
commit b014e997c8
3 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/res/res/values/strings.xml
View File

@@ -187,6 +187,9 @@
<string name="notification_channel_wfc">Wi-Fi calling</string> <string name="notification_channel_wfc">Wi-Fi calling</string>
<!-- Telephony notification channel name for a channel containing SIM notifications --> <!-- Telephony notification channel name for a channel containing SIM notifications -->
<string name="notification_channel_sim">SIM status</string> <string name="notification_channel_sim">SIM status</string>
<!-- Telephony notification channel name for a channel containing high priority SIM notifications -->
<string name="notification_channel_sim_high_prio">High priority SIM status</string>
<!-- Displayed to tell the user that peer changed TTY mode --> <!-- Displayed to tell the user that peer changed TTY mode -->
<string name="peerTtyModeFull">Peer requested TTY Mode FULL</string> <string name="peerTtyModeFull">Peer requested TTY Mode FULL</string>

1
core/res/res/values/symbols.xml
View File

@@ -653,6 +653,7 @@
<java-symbol type="string" name="notification_channel_voice_mail" /> <java-symbol type="string" name="notification_channel_voice_mail" />
<java-symbol type="string" name="notification_channel_wfc" /> <java-symbol type="string" name="notification_channel_wfc" />
<java-symbol type="string" name="notification_channel_sim" /> <java-symbol type="string" name="notification_channel_sim" />
<java-symbol type="string" name="notification_channel_sim_high_prio" />
<java-symbol type="string" name="SetupCallDefault" /> <java-symbol type="string" name="SetupCallDefault" />
<java-symbol type="string" name="accept" /> <java-symbol type="string" name="accept" />
<java-symbol type="string" name="activity_chooser_view_see_all" /> <java-symbol type="string" name="activity_chooser_view_see_all" />

10
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -2150,6 +2150,15 @@ public class CarrierConfigManager {
public static final String KEY_DATA_WARNING_NOTIFICATION_BOOL = public static final String KEY_DATA_WARNING_NOTIFICATION_BOOL =
"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. * Controls the cellular data limit.
* <p> * <p>
@@ -3327,6 +3336,7 @@ public class CarrierConfigManager {
sDefaults.putInt(KEY_MONTHLY_DATA_CYCLE_DAY_INT, DATA_CYCLE_USE_PLATFORM_DEFAULT); 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.putLong(KEY_DATA_WARNING_THRESHOLD_BYTES_LONG, DATA_CYCLE_USE_PLATFORM_DEFAULT);
sDefaults.putBoolean(KEY_DATA_WARNING_NOTIFICATION_BOOL, true); 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.putLong(KEY_DATA_LIMIT_THRESHOLD_BYTES_LONG, DATA_CYCLE_USE_PLATFORM_DEFAULT);
sDefaults.putBoolean(KEY_DATA_LIMIT_NOTIFICATION_BOOL, true); sDefaults.putBoolean(KEY_DATA_LIMIT_NOTIFICATION_BOOL, true);
sDefaults.putBoolean(KEY_DATA_RAPID_NOTIFICATION_BOOL, true); sDefaults.putBoolean(KEY_DATA_RAPID_NOTIFICATION_BOOL, true);