Merge "DO NOT MERGE - Merge Android 10 into master"ndk-sysroot-r21

16 files changed, 68 insertions, 18 deletions

diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 51af5c4..414bfc6 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -42,5 +42,5 @@
     <string name="stk_dialog_accept" msgid="8498901537508923727">"አዎ"</string>
     <string name="stk_dialog_reject" msgid="921848059485746796">"አይ"</string>
     <string name="no_sim_card_inserted" msgid="5316620398365235988">"የሲም መሥሪያ ስብስብን ለማስጀመር እባክዎ ሲም ያስገቡ።"</string>
-    <string name="stk_channel_name" msgid="8828587788561382056">"የተንቀሳቃሽ ስልክ አገልግሎት መልእክቶች"</string>
+    <string name="stk_channel_name" msgid="8828587788561382056">"የተንቀሳቃሽ ስልክ አገልግሎት መልዕክቶች"</string>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 8d981f7..f6af645 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -32,7 +32,7 @@
     <string name="default_setup_call_msg" msgid="6126904475461162162">"جارٍ إعداد المكالمة"</string>
     <string name="stk_app_state" msgid="18582277302584082">"حالة التطبيق"</string>
     <string name="enable_app" msgid="3701224550936728203">"تم التمكين"</string>
-    <string name="disable_app" msgid="6725081975611415214">"معطّل"</string>
+    <string name="disable_app" msgid="6725081975611415214">"غير مفعّل"</string>
     <string name="stk_dialog_title" msgid="6954825385456886726">"‏مجموعة أدوات شريحة SIM"</string>
     <string name="default_tone_dialog_msg" msgid="4595366992944391641">"تشغيل نغمة"</string>
     <string name="default_open_channel_msg" msgid="2216070254100295924">"قناة مفتوحة؟"</string>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index b866021..e34dd4b 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -38,7 +38,7 @@
     <string name="default_open_channel_msg" msgid="2216070254100295924">"চ্চেনেল খুলিবনে?"</string>
     <string name="default_send_data_msg" msgid="6011219698689931272">"ডেটা পঠিয়াই থকা হৈছে"</string>
     <string name="default_receive_data_msg" msgid="618096941772010682">"ডেটা প্ৰাপ্ত কৰি থকা হৈছে"</string>
-    <string name="default_close_channel_msg" msgid="765364262263839824">"চ্চেনেল বন্ধ কৰা হ\'ল"</string>
+    <string name="default_close_channel_msg" msgid="765364262263839824">"চ্চেনেল বন্ধ কৰা হ’ল"</string>
     <string name="stk_dialog_accept" msgid="8498901537508923727">"হয়"</string>
     <string name="stk_dialog_reject" msgid="921848059485746796">"নহয়"</string>
     <string name="no_sim_card_inserted" msgid="5316620398365235988">"ছিমৰ টুলকিট লঞ্চ কৰিবলৈ অনুগ্ৰহ কৰি ছিম ভৰাওক।"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 8af507f..10dc7d8 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -29,7 +29,7 @@
     <string name="alphabet" msgid="1583185545938805861">"Abeceda"</string>
     <string name="digits" msgid="1746796679021682388">"Cifre (0-9, *, #, +)"</string>
     <string name="default_call_setup_msg" msgid="7960194995759849940">"Pozivanje je u toku..."</string>
-    <string name="default_setup_call_msg" msgid="6126904475461162162">"Poziv se podešava"</string>
+    <string name="default_setup_call_msg" msgid="6126904475461162162">"Poziv se pokreće"</string>
     <string name="stk_app_state" msgid="18582277302584082">"Stanje aplikacije"</string>
     <string name="enable_app" msgid="3701224550936728203">"Omogućeno"</string>
     <string name="disable_app" msgid="6725081975611415214">"Onemogućeno"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index b162b3b..c737d46 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -20,7 +20,7 @@
     <string name="menu_end_session" msgid="7368541737750982217">"Afslut sessionen"</string>
     <string name="help" msgid="9209980881219397319">"Hjælp"</string>
     <string name="menu_back" msgid="301227740977453364">"Tilbage"</string>
-    <string name="service_name" msgid="6860303747999592491">"Tjenestenavn"</string>
+    <string name="service_name" msgid="6860303747999592491">"Tjenestens navn"</string>
     <string name="stk_no_service" msgid="5427773116839809131">"Der er ingen tilgængelig tjeneste"</string>
     <string name="button_ok" msgid="5760722312558549555">"OK"</string>
     <string name="button_cancel" msgid="1997847915560800261">"Annuller"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 32ef96e..d61ed31 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -24,7 +24,7 @@
     <string name="stk_no_service" msgid="5427773116839809131">"Kein Dienst verfügbar"</string>
     <string name="button_ok" msgid="5760722312558549555">"OK"</string>
     <string name="button_cancel" msgid="1997847915560800261">"Abbrechen"</string>
-    <string name="button_yes" msgid="624420260648337203">"Ja"</string>
+    <string name="button_yes" msgid="624420260648337203">"\"Ja\""</string>
     <string name="button_no" msgid="1824959157582605627">"Nein"</string>
     <string name="alphabet" msgid="1583185545938805861">"Buchstaben"</string>
     <string name="digits" msgid="1746796679021682388">"Ziffern (0-9, *, #, +)"</string>
@@ -39,7 +39,7 @@
     <string name="default_send_data_msg" msgid="6011219698689931272">"Daten senden"</string>
     <string name="default_receive_data_msg" msgid="618096941772010682">"Daten empfangen"</string>
     <string name="default_close_channel_msg" msgid="765364262263839824">"Kanal geschlossen"</string>
-    <string name="stk_dialog_accept" msgid="8498901537508923727">"Ja"</string>
+    <string name="stk_dialog_accept" msgid="8498901537508923727">"\"JA\""</string>
     <string name="stk_dialog_reject" msgid="921848059485746796">"Nein"</string>
     <string name="no_sim_card_inserted" msgid="5316620398365235988">"Bitte lege die SIM-Karte ein, um das SIM-Toolkit zu starten."</string>
     <string name="stk_channel_name" msgid="8828587788561382056">"Mobilfunkdienst-Nachrichten"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 04147d7..e44d438 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -32,7 +32,7 @@
     <string name="default_setup_call_msg" msgid="6126904475461162162">"Чалуу орнотулууда"</string>
     <string name="stk_app_state" msgid="18582277302584082">"Колдонмонун абалы"</string>
     <string name="enable_app" msgid="3701224550936728203">"Иштетилген"</string>
-    <string name="disable_app" msgid="6725081975611415214">"Токтотулган"</string>
+    <string name="disable_app" msgid="6725081975611415214">"Өчүк"</string>
     <string name="stk_dialog_title" msgid="6954825385456886726">"SIM Шаймандары"</string>
     <string name="default_tone_dialog_msg" msgid="4595366992944391641">"Ойноо добушу"</string>
     <string name="default_open_channel_msg" msgid="2216070254100295924">"Канал ачылсынбы?"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 8274460..6842950 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -42,5 +42,5 @@
     <string name="stk_dialog_accept" msgid="8498901537508923727">"होय"</string>
     <string name="stk_dialog_reject" msgid="921848059485746796">"नाही"</string>
     <string name="no_sim_card_inserted" msgid="5316620398365235988">"कृपया सिम टूलकिट लाँच करण्‍यासाठी सिम घाला."</string>
-    <string name="stk_channel_name" msgid="8828587788561382056">"मोबाइल सेवा संदेश"</string>
+    <string name="stk_channel_name" msgid="8828587788561382056">"मोबाइल सेवा मेसेज"</string>
 </resources>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index ff1aa67..843423a 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -22,7 +22,7 @@
     <string name="menu_back" msgid="301227740977453364">"पछाडि जानुहोस्"</string>
     <string name="service_name" msgid="6860303747999592491">"सेवा नाम"</string>
     <string name="stk_no_service" msgid="5427773116839809131">"सेवा उपलब्ध छैन"</string>
-    <string name="button_ok" msgid="5760722312558549555">"ठीक छ"</string>
+    <string name="button_ok" msgid="5760722312558549555">"ठिक छ"</string>
     <string name="button_cancel" msgid="1997847915560800261">"रद्द गर्नुहोस्"</string>
     <string name="button_yes" msgid="624420260648337203">"हो"</string>
     <string name="button_no" msgid="1824959157582605627">"होइन"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 9d34917..5ed9a87 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -28,7 +28,7 @@
     <string name="button_no" msgid="1824959157582605627">"Nee"</string>
     <string name="alphabet" msgid="1583185545938805861">"Alfabetten"</string>
     <string name="digits" msgid="1746796679021682388">"Symbolen (0-9, *, #, +)"</string>
-    <string name="default_call_setup_msg" msgid="7960194995759849940">"Actieve oproep..."</string>
+    <string name="default_call_setup_msg" msgid="7960194995759849940">"Actief gesprek..."</string>
     <string name="default_setup_call_msg" msgid="6126904475461162162">"Aanroep wordt ingesteld"</string>
     <string name="stk_app_state" msgid="18582277302584082">"Toepassingsstatus"</string>
     <string name="enable_app" msgid="3701224550936728203">"Ingeschakeld"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
new file mode 100644
index 0000000..e827784
--- /dev/null
+++ b/res/values-or/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="8396461461738434341">"SIM ଟୁଲକିଟ୍‌"</string>
+    <string name="menu_end_session" msgid="7368541737750982217">"ସେସନ୍‍ ସମାପ୍ତ କରନ୍ତୁ"</string>
+    <string name="help" msgid="9209980881219397319">"ସହାୟତା"</string>
+    <string name="menu_back" msgid="301227740977453364">"ପଛକୁ"</string>
+    <string name="service_name" msgid="6860303747999592491">"ସେବାର ନାମ"</string>
+    <string name="stk_no_service" msgid="5427773116839809131">"କୌଣସି ସେବା ଉପଲବ୍ଧ ନାହିଁ"</string>
+    <string name="button_ok" msgid="5760722312558549555">"ଠିକ୍‌ ଅଛି"</string>
+    <string name="button_cancel" msgid="1997847915560800261">"କ୍ୟାନ୍ସଲ୍‍ କରନ୍ତୁ"</string>
+    <string name="button_yes" msgid="624420260648337203">"ହଁ"</string>
+    <string name="button_no" msgid="1824959157582605627">"ନା"</string>
+    <string name="alphabet" msgid="1583185545938805861">"ଅକ୍ଷର"</string>
+    <string name="digits" msgid="1746796679021682388">"ସଂଖ୍ୟା (0-9, *, #, +)"</string>
+    <string name="default_call_setup_msg" msgid="7960194995759849940">"କଲ୍‌ ଚାଲୁଛି…"</string>
+    <string name="default_setup_call_msg" msgid="6126904475461162162">"କଲ୍‌ ସେଟଅପ୍‌ ହେଉଛି"</string>
+    <string name="stk_app_state" msgid="18582277302584082">"ଆପ୍ଲିକେଶନ୍‌ର ସ୍ଥିତି"</string>
+    <string name="enable_app" msgid="3701224550936728203">"ଚାଲୁ ହୋଇଛି"</string>
+    <string name="disable_app" msgid="6725081975611415214">"ବନ୍ଦ ହୋଇଛି"</string>
+    <string name="stk_dialog_title" msgid="6954825385456886726">"SIM ଟୁଲକିଟ୍‌"</string>
+    <string name="default_tone_dialog_msg" msgid="4595366992944391641">"ଟୋନ୍‌ ବଜାଯାଉଛି"</string>
+    <string name="default_open_channel_msg" msgid="2216070254100295924">"ଚ୍ୟାନେଲ୍‌ ଖୋଲିବେ?"</string>
+    <string name="default_send_data_msg" msgid="6011219698689931272">"ଡାଟା ପଠାଯାଉଛି"</string>
+    <string name="default_receive_data_msg" msgid="618096941772010682">"ଡାଟା ପ୍ରାପ୍ତ କରୁଛି"</string>
+    <string name="default_close_channel_msg" msgid="765364262263839824">"ଚ୍ୟାନେଲ୍‌ ବନ୍ଦ ଅଛି"</string>
+    <string name="stk_dialog_accept" msgid="8498901537508923727">"ହଁ"</string>
+    <string name="stk_dialog_reject" msgid="921848059485746796">"ନା"</string>
+    <string name="no_sim_card_inserted" msgid="5316620398365235988">"SIM ଟୁଲକିଟ୍‌ ଲଞ୍ଚ କରିବାଲାଗି ଦୟାକରି SIM କାର୍ଡ ଭର୍ତ୍ତି କରନ୍ତୁ"</string>
+    <string name="stk_channel_name" msgid="8828587788561382056">"ମୋବାଇଲ୍‍ ସେବା ମେସେଜ୍‌"</string>
+</resources>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 31d7972..ed8c454 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="8396461461738434341">"SIM Toolkit"</string>
+    <string name="app_name" msgid="8396461461738434341">"ਸਿਮ ਟੂਲਕਿੱਟ"</string>
     <string name="menu_end_session" msgid="7368541737750982217">"ਸੈਸ਼ਨ ਸਮਾਪਤ ਕਰੋ"</string>
     <string name="help" msgid="9209980881219397319">"ਮਦਦ"</string>
     <string name="menu_back" msgid="301227740977453364">"ਪਿੱਛੇ"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 1cd5f21..fbd1cc6 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="8396461461738434341">"Toolkit do SIM"</string>
+    <string name="app_name" msgid="8396461461738434341">"Toolkit do chip"</string>
     <string name="menu_end_session" msgid="7368541737750982217">"Finalizar a sessão"</string>
     <string name="help" msgid="9209980881219397319">"Ajuda"</string>
     <string name="menu_back" msgid="301227740977453364">"Voltar"</string>
@@ -33,7 +33,7 @@
     <string name="stk_app_state" msgid="18582277302584082">"Estado do app"</string>
     <string name="enable_app" msgid="3701224550936728203">"Ativado"</string>
     <string name="disable_app" msgid="6725081975611415214">"Desativado"</string>
-    <string name="stk_dialog_title" msgid="6954825385456886726">"Toolkit do SIM"</string>
+    <string name="stk_dialog_title" msgid="6954825385456886726">"Toolkit do chip"</string>
     <string name="default_tone_dialog_msg" msgid="4595366992944391641">"Reproduzindo tom"</string>
     <string name="default_open_channel_msg" msgid="2216070254100295924">"Abrir canal?"</string>
     <string name="default_send_data_msg" msgid="6011219698689931272">"Enviando dados"</string>
@@ -41,6 +41,6 @@
     <string name="default_close_channel_msg" msgid="765364262263839824">"Canal fechado"</string>
     <string name="stk_dialog_accept" msgid="8498901537508923727">"SIM"</string>
     <string name="stk_dialog_reject" msgid="921848059485746796">"NÃO"</string>
-    <string name="no_sim_card_inserted" msgid="5316620398365235988">"Insira o cartão SIM para iniciar a Barra de ferramentas SIM."</string>
+    <string name="no_sim_card_inserted" msgid="5316620398365235988">"Insira o chip para iniciar a Barra de ferramentas SIM."</string>
     <string name="stk_channel_name" msgid="8828587788561382056">"Mensagens de serviço móvel"</string>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 0438132..644e789 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -29,7 +29,7 @@
     <string name="alphabet" msgid="1583185545938805861">"Абецеда"</string>
     <string name="digits" msgid="1746796679021682388">"Цифре (0-9, *, #, +)"</string>
     <string name="default_call_setup_msg" msgid="7960194995759849940">"Позивање је у току..."</string>
-    <string name="default_setup_call_msg" msgid="6126904475461162162">"Позив се подешава"</string>
+    <string name="default_setup_call_msg" msgid="6126904475461162162">"Позив се покреће"</string>
     <string name="stk_app_state" msgid="18582277302584082">"Стање апликације"</string>
     <string name="enable_app" msgid="3701224550936728203">"Омогућено"</string>
     <string name="disable_app" msgid="6725081975611415214">"Онемогућено"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 40eab69..d9ecefb 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="8396461461738434341">"SIM karta menyusi"</string>
+    <string name="app_name" msgid="8396461461738434341">"SIM menyusi"</string>
     <string name="menu_end_session" msgid="7368541737750982217">"Sessiyani yakunlash"</string>
     <string name="help" msgid="9209980881219397319">"Yordam"</string>
     <string name="menu_back" msgid="301227740977453364">"Orqaga"</string>
@@ -33,7 +33,7 @@
     <string name="stk_app_state" msgid="18582277302584082">"Ilova holati"</string>
     <string name="enable_app" msgid="3701224550936728203">"Yoniq"</string>
     <string name="disable_app" msgid="6725081975611415214">"O‘chiq"</string>
-    <string name="stk_dialog_title" msgid="6954825385456886726">"SIM karta menyusi"</string>
+    <string name="stk_dialog_title" msgid="6954825385456886726">"SIM menyusi"</string>
     <string name="default_tone_dialog_msg" msgid="4595366992944391641">"Signal ijrosi"</string>
     <string name="default_open_channel_msg" msgid="2216070254100295924">"Kanal ochilsinmi?"</string>
     <string name="default_send_data_msg" msgid="6011219698689931272">"Ma’lumot yuborilmoqda"</string>
diff --git a/src/com/android/stk/StkAppService.java b/src/com/android/stk/StkAppService.java
index 2c51efe..cb9564e 100644
--- a/src/com/android/stk/StkAppService.java
+++ b/src/com/android/stk/StkAppService.java
@@ -1832,6 +1832,10 @@ public class StkAppService extends Service implements Runnable {
                     }
 
                     @Override
+                    public void onForegroundServicesChanged(int pid, int uid, int fgServiceTypes) {
+                    }
+
+                    @Override
                     public void onProcessDied(int pid, int uid) {
                     }
                 };