From: Seongho Kim <sh_tiger.kim@samsung.com>
Date: Tue, 13 Nov 2018 06:08:34 +0000 (+0900)
Subject: Add carrier's option to cancel CS reject cause notification
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d351dba3a20e9d39ea4d6dd94ab9e17069440bc1;p=android-x86%2Fframeworks-base.git

Add carrier's option to cancel CS reject cause notification

Some carrier still want to cancel CS reject notification automatically
when it gets service. So, we need a way to set carrier's option for it.

Bug: 79889307
Test: Manual
Change-Id: If4c696e8116094d0cb555fe87c92243af1f34cec
Merged-In: If4c696e8116094d0cb555fe87c92243af1f34cec
---

diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
old mode 100644
new mode 100755
index 89c65a09057b..3454c1cbc14c
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -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.
@@ -2875,6 +2886,7 @@ public class CarrierConfigManager {
                 });
         sDefaults.putString(KEY_5G_ICON_CONFIGURATION_STRING,
                 "connected_mmwave:None,connected:5G,not_restricted:None,restricted:None");
+        sDefaults.putBoolean(KEY_AUTO_CANCEL_CS_REJECT_NOTIFICATION, false);
     }
 
     /**