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

Commit b014e997 authored by Chen Xu's avatar Chen Xu Committed by android-build-merger
Browse files

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

am: fed8ece4

Change-Id: Iaae22ceea1ac87d1e4de7c6d15a53655d6faae46
parents 5b921e76 fed8ece4

core/res/res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -187,6 +187,9 @@ 
    <string name="notification_channel_wfc">Wi-Fi calling</string>

    <!-- Telephony notification channel name for a channel containing SIM notifications -->

    <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 -->

    <string name="peerTtyModeFull">Peer requested TTY Mode FULL</string>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -653,6 +653,7 @@ 
  <java-symbol type="string" name="notification_channel_voice_mail" />

  <java-symbol type="string" name="notification_channel_wfc" />

  <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="accept" />

  <java-symbol type="string" name="activity_chooser_view_see_all" />

telephony/java/android/telephony/CarrierConfigManager.java

+10 −0
Original line number Diff line number Diff line
@@ -2150,6 +2150,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.

     * <p>
@@ -3327,6 +3336,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);