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

Commit 0fd9d60c authored by Jordan Liu's avatar Jordan Liu Committed by Android (Google) Code Review
Browse files

Merge "Add carrier's option to cancel CS reject cause notification" into pi-dev-plus-aosp

parents 0a0213e4 431e03a6

telephony/java/android/telephony/CarrierConfigManager.java

100644 → 100755
+12 −0
Original line number Diff line number Diff line
@@ -2454,6 +2454,17 @@ public class CarrierConfigManager { 
     */

    public static final String KEY_OPPORTUNISTIC_NETWORK_DATA_SWITCH_HYSTERESIS_TIME_LONG =

            "opportunistic_network_data_switch_hysteresis_time_long";

    /**

     * Determines whether the carrier wants to cancel the cs reject notification automatically

     * when the voice registration state changes.

     * If true, the notification will be automatically removed

     *          when the voice registration state changes.

     * If false, the notification will persist until the user dismisses it,

     *           the SIM is removed, or the device is rebooted.

     * @hide

     */

    public static final String KEY_AUTO_CANCEL_CS_REJECT_NOTIFICATION =

            "carrier_auto_cancel_cs_notification";



   /**

    * An int array containing CDMA enhanced roaming indicator values for Home (non-roaming) network.
@@ -2880,6 +2891,7 @@ public class CarrierConfigManager { 
        sDefaults.putString(KEY_5G_ICON_CONFIGURATION_STRING,

                "connected_mmwave:None,connected:5G,not_restricted:None,restricted:None");

        sDefaults.putBoolean(KEY_USE_USIM_BOOL, false);

        sDefaults.putBoolean(KEY_AUTO_CANCEL_CS_REJECT_NOTIFICATION, false);

    }



    /**