Merge "Remove channels for 3G service of softbank in Japan" into udc-mainline-prod am: 7a0412dfac

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/CellBroadcastReceiver/+/25110683

Change-Id: I10bcbbe004342fd670d8161b4fac86569f726b0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2 files changed, 0 insertions, 44 deletions

diff --git a/res/values-mcc440-mnc20/config.xml b/res/values-mcc440-mnc20/config.xml
index ee877aa10..3bdcd9edb 100644
--- a/res/values-mcc440-mnc20/config.xml
+++ b/res/values-mcc440-mnc20/config.xml
@@ -19,13 +19,6 @@
     <string-array name="etws_test_alerts_range_strings" translatable="false">
         <item>0x1103:rat=gsm, emergency=true, debug_build=true</item>
     </string-array>
-    <string-array name="additional_cbs_channels_strings" translatable="false">
-        <item>0xA800:type=etws_earthquake, emergency=true, scope=carrier</item>
-        <item>0xAFEE:type=etws_tsunami, emergency=true, scope=carrier</item>
-        <item>0xAC00-0xAFED:type=other, emergency=true, scope=carrier</item>
-        <item>0xA802:type=test, emergency=true, scope=carrier</item>
-        <item>0xA804:type=test, emergency=true, scope=carrier</item>
-    </string-array>
     <!-- Whether to show test settings -->
     <bool name="show_test_settings">false</bool>
     <bool name="allow_testing_mode_on_user_build">false</bool>
diff --git a/tests/compliancetests/assets/emergency_alert_channels.json b/tests/compliancetests/assets/emergency_alert_channels.json
index 04afcc591..a0d3873bc 100644
--- a/tests/compliancetests/assets/emergency_alert_channels.json
+++ b/tests/compliancetests/assets/emergency_alert_channels.json
@@ -728,43 +728,6 @@
       "title": "子供の誘拐（誘拐事件速報）", //"Child abduction (Amber alert)",
       "default_value": "true",
       "toggle_avail": "true"
-    },
-    "43008": {
-      "title": "緊急地震速報", //"Earthquake warning",
-      "default_value": "true",
-      "toggle_avail": "false"
-    },
-    "45038": {
-      "title": "津波警報", //"Tsunami warning",
-      "default_value": "true",
-      "toggle_avail": "false",
-      "warning_type": "02"
-    },
-    "44032": {
-      "title": "緊急速報メール", //"Emergency warning",
-      "default_value": "true",
-      "toggle_avail": "false",
-      "end_channel": "45037"
-    },
-    "45000": {
-      "title": "緊急速報メール", //"Emergency warning",
-      "default_value": "true",
-      "toggle_avail": "false"
-    },
-    "45037": {
-      "title": "緊急速報メール", //"Emergency warning",
-      "default_value": "true",
-      "toggle_avail": "false"
-    },
-    "43010": {
-      "title": "ETWS 試験メッセージ", //"ETWS test message",
-      "default_value": "false",
-      "toggle_avail": "false"
-    },
-    "43012": {
-      "title": "ETWS 試験メッセージ", //"ETWS test message",
-      "default_value": "false",
-      "toggle_avail": "false"
     }
   },
   "hongkong": {