From bcfaa1dce2a4515ff19a633e8c21870c111e1777 Mon Sep 17 00:00:00 2001
From: Jake Weinstein <jake@aospa.co>
Date: Sat, 5 Dec 2020 07:07:29 +0100
Subject: [PATCH] sm8550-common: CarrierConfig: Disable global mode and CDMA
 choices

 * Cleans up mobile network settings.

Change-Id: I0c6b4d1fc3ccd79739ee9b1cc6aecc42e5a83516
---
 overlay/CarrierConfigResCommon/res/xml/vendor.xml | 6 ++++--
 overlay/TelephonyResCommon/res/values/config.xml  | 3 ---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/overlay/CarrierConfigResCommon/res/xml/vendor.xml b/overlay/CarrierConfigResCommon/res/xml/vendor.xml
index f2353ba..7ab9872 100644
--- a/overlay/CarrierConfigResCommon/res/xml/vendor.xml
+++ b/overlay/CarrierConfigResCommon/res/xml/vendor.xml
@@ -2,10 +2,12 @@
 <carrier_config_list>
     <carrier_config>
         <boolean name="apn_expand_bool" value="true" />
-        <boolean name="world_phone_bool" value="true" />
+        <!-- PA: Disable World Mode to clean up network modes -->
+        <boolean name="world_phone_bool" value="false" />
         <boolean name="allow_adding_apns_bool" value="true" />
         <boolean name="hide_preferred_network_type_bool" value="false" />
-        <boolean name="show_cdma_choices_bool" value="true" />
+        <!-- PA: Disable CDMA Choices to clean up settings -->
+        <boolean name="show_cdma_choices_bool" value="false" />
         <boolean name="allow_video_call_in_low_battery" value="true" />
         <boolean name="config_enable_display_14digit_imei" value="false" />
         <boolean name="video_call_use_ext" value="true" />
diff --git a/overlay/TelephonyResCommon/res/values/config.xml b/overlay/TelephonyResCommon/res/values/config.xml
index 6e096ed..dbf4313 100644
--- a/overlay/TelephonyResCommon/res/values/config.xml
+++ b/overlay/TelephonyResCommon/res/values/config.xml
@@ -9,9 +9,6 @@
          successfully placing the OTA call -->
     <integer name="OtaShowListeningScreen">1</integer>
 
-    <!-- DEPRECATED: Use CarrierConfigManager#KEY_WORLD_PHONE_BOOL -->
-    <bool name="world_phone">true</bool>
-
     <!-- DEPRECATED: Use CarrierConfigManager#KEY_DTMF_TYPE_ENABLED_BOOL -->
     <bool name="dtmf_type_enabled">true</bool>