commit 058c408622a3c5134979b6e131aaa5373af5c0d7
author Jordan Liu <jminjie@google.com> Fri Feb 02 07:54:35 2018 +0000
committer android-build-merger <android-build-merger@google.com> Fri Feb 02 07:54:35 2018 +0000
tree db96c5318ac0e9a360900765a0a73ca59c76d8d4
parent 742515b1782f3bdd0e5d853c57d3de334aac5325
parent 32d87828e0f367c74a7473688d1b28135eaf4ef8

Merge "Add carrier config option to show call barring UI in CallSettings" am: 2aa0cdd1d2 am: ba0581bcf1
am: 32d87828e0

Change-Id: I5478643481f58006182f715b7c49816b0df89230

telephony/java/android/telephony/CarrierConfigManager.java

diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index 7b11226..d2cd3a9 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -77,6 +77,14 @@
     public static final String
             KEY_CARRIER_VOLTE_PROVISIONED_BOOL = "carrier_volte_provisioned_bool";
 
+   /**
+    * Boolean indicating if the "Call barring" item is visible in the Call Settings menu.
+    * true means visible. false means gone.
+    * @hide
+    */
+    public static final String KEY_CALL_BARRING_VISIBILITY_BOOL =
+            "call_barring_visibility_bool";
+
     /**
      * Flag indicating whether the Phone app should ignore EVENT_SIM_NETWORK_LOCKED
      * events from the Sim.
@@ -1841,6 +1849,7 @@
         sDefaults.putBoolean(KEY_HIDE_SIM_LOCK_SETTINGS_BOOL, false);
 
         sDefaults.putBoolean(KEY_CARRIER_VOLTE_PROVISIONED_BOOL, false);
+        sDefaults.putBoolean(KEY_CALL_BARRING_VISIBILITY_BOOL, false);
         sDefaults.putBoolean(KEY_IGNORE_SIM_NETWORK_LOCKED_EVENTS_BOOL, false);
         sDefaults.putBoolean(KEY_MDN_IS_ADDITIONAL_VOICEMAIL_NUMBER_BOOL, false);
         sDefaults.putBoolean(KEY_OPERATOR_SELECTION_EXPAND_BOOL, true);