From 51dbc6585af4fc2fbc8be8b90264a86a0ef9ac96 Mon Sep 17 00:00:00 2001
From: Shoki Inoka <shoki.x.inoka@sony.com>
Date: Fri, 29 Nov 2019 14:58:13 +0900
Subject: [PATCH] Make IMS supported Call Barring MMI codes customizable

Add a new config which indicates supported call barring
MMI codes for IMS.

Test: manual - Checked the correct handling of call barring MMI request
according to new resource config.
Bug: 141349920
Change-Id: Id9bb61682bb23989f4ff889978459ab4147bbdf7
---
 core/res/res/values-mcc510-mnc08/config.xml |  2 ++
 core/res/res/values-mcc510-mnc89/config.xml |  2 ++
 core/res/res/values/config.xml              | 12 ++++++++++++
 core/res/res/values/symbols.xml             |  1 +
 4 files changed, 17 insertions(+)

diff --git a/core/res/res/values-mcc510-mnc08/config.xml b/core/res/res/values-mcc510-mnc08/config.xml
index 7b27554d47b5c..58fbb9ea44de5 100644
--- a/core/res/res/values-mcc510-mnc08/config.xml
+++ b/core/res/res/values-mcc510-mnc08/config.xml
@@ -23,4 +23,6 @@
          and "333" is used for other purpose -->
     <string-array translatable="false" name="config_callBarringMMI">
     </string-array>
+    <string-array translatable="false" name="config_callBarringMMI_for_ims">
+    </string-array>
 </resources>
diff --git a/core/res/res/values-mcc510-mnc89/config.xml b/core/res/res/values-mcc510-mnc89/config.xml
index 82efecffb7c16..c262247f2a88b 100644
--- a/core/res/res/values-mcc510-mnc89/config.xml
+++ b/core/res/res/values-mcc510-mnc89/config.xml
@@ -23,4 +23,6 @@
          and "333" is used for other purpose -->
     <string-array translatable="false" name="config_callBarringMMI">
     </string-array>
+    <string-array translatable="false" name="config_callBarringMMI_for_ims">
+    </string-array>
 </resources>
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 4c25a7a08cf59..4b5840e691037 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -2797,6 +2797,18 @@
         <item>353</item>
     </string-array>
 
+    <!-- Ims supported call barring MMI code -->
+    <string-array translatable="false" name="config_callBarringMMI_for_ims">
+        <item>33</item>
+        <item>331</item>
+        <item>332</item>
+        <item>35</item>
+        <item>351</item>
+        <item>330</item>
+        <item>333</item>
+        <item>353</item>
+    </string-array>
+
     <!-- Override the default detection behavior for the framework method
          android.view.ViewConfiguration#hasPermanentMenuKey().
          Valid settings are:
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index a1f66d352bcf9..04b86a8fee0f5 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -1312,6 +1312,7 @@
   <java-symbol type="array" name="config_cdma_dun_supported_types" />
   <java-symbol type="array" name="config_disabledUntilUsedPreinstalledImes" />
   <java-symbol type="array" name="config_callBarringMMI" />
+  <java-symbol type="array" name="config_callBarringMMI_for_ims" />
   <java-symbol type="array" name="config_globalActionsList" />
   <java-symbol type="array" name="config_telephonyEuiccDeviceCapabilities" />
   <java-symbol type="array" name="config_telephonyHardware" />