From fc06a5e2504b3739a79ebf362cfa7d4d49655ce6 Mon Sep 17 00:00:00 2001
From: Tyler Gunn <tgunn@google.com>
Date: Mon, 2 Mar 2020 23:24:46 +0000
Subject: [PATCH] Revert "Add USSD codes over IMS feature"

Revert "Add USSD codes over IMS feature"

Revert submission 1213006-ussd-ims

Reason for revert: Breaks non-ims calling.
Bug: 150596001
Reverted Changes:
If6cf5bd56:Add USSD codes over IMS feature
I08855fd89:Add USSD codes over IMS feature

Change-Id: I90b038a945190fd1e1a4c3604f022bd81a6ae53c
---
 core/res/res/values/config.xml  | 4 ----
 core/res/res/values/symbols.xml | 1 -
 2 files changed, 5 deletions(-)

diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 5ffd6d87bd829..054195588102d 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -3031,10 +3031,6 @@
     <!-- Whether to use voip audio mode for ims call -->
     <bool name="config_use_voip_mode_for_ims">false</bool>
 
-    <!-- Boolean indicating USSD over IMS is allowed.
-     If it is not supported due to modem limitations, USSD send over the CS pipe instead.-->
-    <bool name="config_allow_ussd_over_ims">false</bool>
-
     <!-- String array containing numbers that shouldn't be logged. Country-specific. -->
     <string-array name="unloggable_phone_numbers" />
 
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 303e26391933a..d1e449e13e0f6 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -2623,7 +2623,6 @@
   <java-symbol type="bool" name="config_device_wfc_ims_available" />
   <java-symbol type="bool" name="config_carrier_wfc_ims_available" />
   <java-symbol type="bool" name="config_use_voip_mode_for_ims" />
-  <java-symbol type="bool" name="config_allow_ussd_over_ims" />
   <java-symbol type="attr" name="touchscreenBlocksFocus" />
   <java-symbol type="layout" name="resolver_list_with_default" />
   <java-symbol type="string" name="activity_resolver_set_always" />