commit 29b132bff440dba278d5531c824ff5387b2d7cf7
author Omata Shou <shou.omata@sony.com> Tue Aug 22 17:17:55 2017 +0900
committer Jordan Liu <jminjie@google.com> Thu Oct 12 16:41:20 2017 -0700
tree bbf7f5853e9006ee8abb26af683b60d1d700c0bd
parent ed8d236319a112a0b19b1f05ea55a90ba93e8aa2

Add a new carrier config to suppress AoC indication

Some carriers require to suppress the AoC(Advice of Charge) indication.
This carrier config is used to disable the popup dialog which warns the
user of data charges.

Test: Passed make build
Bug: 65036581
Merged-In: Ibb8d548573c9c747c790722ee526fcd626b3fa67
Change-Id: Ibb8d548573c9c747c790722ee526fcd626b3fa67

telephony/java/android/telephony/CarrierConfigManager.java

diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index 386a3a3..7a6fbf3 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -1523,6 +1523,13 @@
     public static final String KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL =
             "show_ims_registration_status_bool";
 
+    /**
+     * The flag to disable the popup dialog which warns the user of data charges.
+     * @hide
+     */
+    public static final String KEY_DISABLE_CHARGE_INDICATION_BOOL =
+            "disable_charge_indication_bool";
+
     /** The default value for every variable. */
     private final static PersistableBundle sDefaults;
 
@@ -1777,6 +1784,7 @@
         sDefaults.putInt(IMSI_KEY_EXPIRATION_DAYS_TIME_INT, IMSI_ENCRYPTION_DAYS_TIME_DISABLED);
         sDefaults.putString(IMSI_KEY_DOWNLOAD_URL_STRING, null);
         sDefaults.putBoolean(KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL, false);
+        sDefaults.putBoolean(KEY_DISABLE_CHARGE_INDICATION_BOOL, false);
     }
 
     /**