Merge tag 'android-10.0.0_r37' into staging/lineage-17.1_merge-android-10.0.0_r37lineage-17.1

Android 10.0.0 Release 37 (QQ3A.200605.001)

* tag 'android-10.0.0_r37':
  Fixed notification tone not working
  DO NOT MERGE Added more mcc mnc for AT&T MNO/MVNO
  Import translations. DO NOT MERGE

Change-Id: I9c7dbdad275cdd301e7b8e42708ec267c4204d6a

16 files changed, 17 insertions, 39 deletions

diff --git a/res/raw/info.ogg b/res/raw/info.ogg
new file mode 100644
index 00000000..fe301375
--- /dev/null
+++ b/res/raw/info.ogg
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 06bb12f2..58076893 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -45,9 +45,9 @@
     <string name="cmas_exercise_alert" msgid="2892255514938370321">"비상사태 경보(테스트)"</string>
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"비상사태 경보(통신사)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"브로드캐스트 메시지"</string>
-    <string name="public_safety_message" msgid="9119928798786998252">"공공 안전 메시지"</string>
+    <string name="public_safety_message" msgid="9119928798786998252">"안전 안내 문자"</string>
     <string name="state_local_test_alert" msgid="8003145745857480200">"주/지방 테스트"</string>
-    <string name="emergency_alert" msgid="624783871477634263">"비상사태 경고"</string>
+    <string name="emergency_alert" msgid="624783871477634263">"긴급 재난 문자"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"경보"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"브로드캐스트 메시지"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"긴급 경보"</string>
@@ -68,11 +68,11 @@
     <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"아동 유괴 긴급상황 공지"</string>
     <string name="enable_alert_message_title" msgid="2939830587633599352">"경보 메시지"</string>
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"임박한 안전 위협 경고"</string>
-    <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"공공 안전 메시지"</string>
+    <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"안전 안내 문자"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"생명이나 재산을 보호할 수 있는 행동 요령"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"주 및 지방 테스트"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"주 및 지방 당국으로부터 테스트 메시지 수신"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"긴급 경보"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"긴급 재난 문자"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"치명적인 사건 경고"</string>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"필수 월간 테스트"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="588517403520088484">"안전 경보 시스템의 테스트 메시지 수신"</string>
diff --git a/res/values-mcc310-mnc150 b/res/values-mcc310-mnc150
new file mode 120000
index 00000000..78e65039
--- /dev/null
+++ b/res/values-mcc310-mnc150
@@ -0,0 +1 @@
+values-mcc310-mnc410
\ No newline at end of file
diff --git a/res/values-mcc310-mnc16 b/res/values-mcc310-mnc16
new file mode 120000
index 00000000..78e65039
--- /dev/null
+++ b/res/values-mcc310-mnc16
@@ -0,0 +1 @@
+values-mcc310-mnc410
\ No newline at end of file
diff --git a/res/values-mcc310-mnc280 b/res/values-mcc310-mnc280
new file mode 120000
index 00000000..78e65039
--- /dev/null
+++ b/res/values-mcc310-mnc280
@@ -0,0 +1 @@
+values-mcc310-mnc410
\ No newline at end of file
diff --git a/res/values-mcc310-mnc30 b/res/values-mcc310-mnc30
new file mode 120000
index 00000000..78e65039
--- /dev/null
+++ b/res/values-mcc310-mnc30
@@ -0,0 +1 @@
+values-mcc310-mnc410
\ No newline at end of file
diff --git a/res/values-mcc310-mnc90 b/res/values-mcc310-mnc90
new file mode 120000
index 00000000..78e65039
--- /dev/null
+++ b/res/values-mcc310-mnc90
@@ -0,0 +1 @@
+values-mcc310-mnc410
\ No newline at end of file
diff --git a/res/values-mcc310-mnc950 b/res/values-mcc310-mnc950
new file mode 120000
index 00000000..78e65039
--- /dev/null
+++ b/res/values-mcc310-mnc950
@@ -0,0 +1 @@
+values-mcc310-mnc410
\ No newline at end of file
diff --git a/res/values-mcc313-mnc100 b/res/values-mcc313-mnc100
new file mode 120000
index 00000000..78e65039
--- /dev/null
+++ b/res/values-mcc313-mnc100
@@ -0,0 +1 @@
+values-mcc310-mnc410
\ No newline at end of file
diff --git a/res/values-mcc313-mnc100/config.xml b/res/values-mcc313-mnc100/config.xml
deleted file mode 100644
index 423eaea5..00000000
--- a/res/values-mcc313-mnc100/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2019 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources>
-    <!-- Whether to compare message body when performing message duplicate dection -->
-    <bool name="duplicate_compare_body">true</bool>
-    <!-- Whether to reset alert message duplicate detection after toggling airplane mode -->
-    <bool name="reset_duplicate_detection_on_airplane_mode">true</bool>
-    <!-- Show timestamp of the alert -->
-    <bool name="show_date_time_title">true</bool>
-</resources>
-
diff --git a/res/values-mcc313-mnc110 b/res/values-mcc313-mnc110
index 2d21ee5b..78e65039 120000
--- a/res/values-mcc313-mnc110
+++ b/res/values-mcc313-mnc110
@@ -1 +1 @@
-values-mcc313-mnc100
\ No newline at end of file
+values-mcc310-mnc410
\ No newline at end of file
diff --git a/res/values-mcc313-mnc120 b/res/values-mcc313-mnc120
index 2d21ee5b..78e65039 120000
--- a/res/values-mcc313-mnc120
+++ b/res/values-mcc313-mnc120
@@ -1 +1 @@
-values-mcc313-mnc100
\ No newline at end of file
+values-mcc310-mnc410
\ No newline at end of file
diff --git a/res/values-mcc313-mnc130 b/res/values-mcc313-mnc130
index 2d21ee5b..78e65039 120000
--- a/res/values-mcc313-mnc130
+++ b/res/values-mcc313-mnc130
@@ -1 +1 @@
-values-mcc313-mnc100
\ No newline at end of file
+values-mcc310-mnc410
\ No newline at end of file
diff --git a/res/values-mcc313-mnc140 b/res/values-mcc313-mnc140
index 2d21ee5b..78e65039 120000
--- a/res/values-mcc313-mnc140
+++ b/res/values-mcc313-mnc140
@@ -1 +1 @@
-values-mcc313-mnc100
\ No newline at end of file
+values-mcc310-mnc410
\ No newline at end of file
diff --git a/res/values-mcc450-ko/strings.xml b/res/values-mcc450-ko/strings.xml
index b9272f5d..0e935e6a 100644
--- a/res/values-mcc450-ko/strings.xml
+++ b/res/values-mcc450-ko/strings.xml
@@ -16,5 +16,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"주요 비상사태 경보"</string>
+    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"위급 재난 문자"</string>
 </resources>
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertAudio.java b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertAudio.java
index 8d913dfe..e7b2cfa6 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertAudio.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertAudio.java
@@ -36,7 +36,6 @@ import android.os.Message;
 import android.os.VibrationEffect;
 import android.os.Vibrator;
 import android.preference.PreferenceManager;
-import android.provider.Settings;
 import android.speech.tts.TextToSpeech;
 import android.telephony.PhoneStateListener;
 import android.telephony.TelephonyManager;
@@ -428,11 +427,7 @@ public class CellBroadcastAlertAudio extends Service implements TextToSpeech.OnI
                         setDataSourceFromResource(res, mMediaPlayer, R.raw.etws_default);
                         break;
                     case INFO:
-                        // for non-emergency alerts, we are using system default notification sound.
-                        String sound = Settings.System.getString(
-                                getApplicationContext().getContentResolver(),
-                                Settings.System.NOTIFICATION_SOUND);
-                        mMediaPlayer.setDataSource(sound);
+                        setDataSourceFromResource(res, mMediaPlayer, R.raw.info);
                         break;
                     case TEST:
                     case DEFAULT: