Merge "Revert "Add a new protected intent ACTION_MMSSMS_DATABASE_LOST"" into pi-dev
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index b37170f..8f3ccdc 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -248,14 +248,14 @@
<string name="roaming_warning" msgid="1603164667540144353">"Du kan risikere at skulle betale høje gebyrer."</string>
<string name="roaming_check_price_warning" msgid="7497570906830902550">"Kontakt din netværksudbyder for at få oplyst priser."</string>
<string name="roaming_alert_title" msgid="3654815360303826008">"Vil du tillade dataroaming?"</string>
- <string name="data_usage_title" msgid="4042209259808900283">"Appens dataforbrug"</string>
+ <string name="data_usage_title" msgid="4042209259808900283">"Dataforbrug fra apps"</string>
<string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_1">%1$s</xliff:g> mobildata er brugt i perioden <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="advanced_options_title" msgid="8074895510265488035">"Avanceret"</string>
<string name="carrier_settings_euicc" msgid="6714062862127226405">"Mobilselskab"</string>
<string name="keywords_carrier_settings_euicc" msgid="6861505396475991277">"mobilselskab, esim, sim-kort, euicc, skift mobilselskab, tilføj mobilselskab"</string>
<string name="carrier_settings_euicc_summary" msgid="5115001942761995457">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> – <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
<string name="mobile_data_settings_title" msgid="4661165467914727157">"Mobildata"</string>
- <string name="mobile_data_settings_summary" msgid="5087255915840576895">"Få adgang til data via mobilnetværk"</string>
+ <string name="mobile_data_settings_summary" msgid="5087255915840576895">"Brug data via mobilnetværk"</string>
<string name="data_usage_disable_mobile" msgid="3577275288809667615">"Vil du deaktivere mobildata?"</string>
<string name="sim_selection_required_pref" msgid="7049424902961844236">"Du har ikke valgt endnu"</string>
<string name="sim_change_data_title" msgid="5332425991853799280">"Skift SIM-kortet til data?"</string>
@@ -509,7 +509,7 @@
<string name="incall_error_supp_service_hold" msgid="7967020511232222078">"Opkald kan ikke sættes i venteposition."</string>
<string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Opret forbindelse til et trådløst netværk for at foretage et opkald."</string>
<string name="incall_error_promote_wfc" msgid="106510757624022064">"Aktivér Wi-Fi-opkald for at foretage et opkald."</string>
- <string name="emergency_information_hint" msgid="399011533038204351">"Oplysninger i nødsituationer"</string>
+ <string name="emergency_information_hint" msgid="399011533038204351">"Info til nødsituationer"</string>
<string name="emergency_information_owner_hint" msgid="688331472291637149">"Ejer"</string>
<string name="emergency_information_confirm_hint" msgid="4039012670779853030">"Tryk igen for at se oplysninger"</string>
<string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Nødopkald"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index af87d86..d0ed79a 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -523,7 +523,7 @@
<string name="dial_emergency_calling_not_available" msgid="5675557523782491826">"Notruf nicht verfügbar"</string>
<string name="police_type_description" msgid="5324410799919829693">"Polizei"</string>
<string name="ambulance_type_description" msgid="4114815025408089866">"Krankenwagen"</string>
- <string name="fire_type_description" msgid="7145996705197064710">"Feuer"</string>
+ <string name="fire_type_description" msgid="7145996705197064710">"Feuerwehr"</string>
<string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</string>
<string name="dialerKeyboardHintText" msgid="9192914825413747792">"Zum Wählen Tastatur verwenden"</string>
<string name="onscreenHoldText" msgid="2285258239691145872">"Halten"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 24216fa..2cf3453 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -249,7 +249,7 @@
<string name="roaming_check_price_warning" msgid="7497570906830902550">"Επικοινωνήστε με τον πάροχο του δικτύου για τις τιμές."</string>
<string name="roaming_alert_title" msgid="3654815360303826008">"Να επιτρέπεται η περιαγωγή δεδομένων;"</string>
<string name="data_usage_title" msgid="4042209259808900283">"Χρήση δεδομένων εφαρμογής"</string>
- <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_1">%1$s</xliff:g> δεδομένα κινητής τηλεφωνίας σε χρήση μεταξύ <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+ <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_1">%1$s</xliff:g> δεδομένων κινητής τηλεφωνίας χρησιμοποιήθηκαν μεταξύ <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="advanced_options_title" msgid="8074895510265488035">"Σύνθετες ρυθμίσεις"</string>
<string name="carrier_settings_euicc" msgid="6714062862127226405">"Εταιρεία κινητής τηλεφωνίας"</string>
<string name="keywords_carrier_settings_euicc" msgid="6861505396475991277">"εταιρεία κινητής τηλεφωνίας, esim, sim, euicc, αλλαγή εταιρείας κινητής τηλεφωνίας, προσθήκη εταιρείας κινητής τηλεφωνίας"</string>
@@ -519,7 +519,7 @@
<string name="dial_emergency_calling_not_available" msgid="5675557523782491826">"Η δυνατότητα κλήσεων έκτακτης ανάγκης δεν είναι διαθέσιμη"</string>
<string name="police_type_description" msgid="5324410799919829693">"Αστυνομία"</string>
<string name="ambulance_type_description" msgid="4114815025408089866">"Ασθενοφόρο"</string>
- <string name="fire_type_description" msgid="7145996705197064710">"Πυρκαγιά"</string>
+ <string name="fire_type_description" msgid="7145996705197064710">"Πυροσβεστική"</string>
<string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</string>
<string name="dialerKeyboardHintText" msgid="9192914825413747792">"Χρησιμοποιήστε το πληκτρολόγιο για να πραγματοποιήσετε καλέσετε έναν αριθμό"</string>
<string name="onscreenHoldText" msgid="2285258239691145872">"Αναμονή"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 97161e7..0e8ea04 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -519,7 +519,7 @@
<string name="dial_emergency_calling_not_available" msgid="5675557523782491826">"Las llamadas de emergencia no están disponibles"</string>
<string name="police_type_description" msgid="5324410799919829693">"Policía"</string>
<string name="ambulance_type_description" msgid="4114815025408089866">"Ambulancia"</string>
- <string name="fire_type_description" msgid="7145996705197064710">"Fuego"</string>
+ <string name="fire_type_description" msgid="7145996705197064710">"Bomberos"</string>
<string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</string>
<string name="dialerKeyboardHintText" msgid="9192914825413747792">"Utilizar teclado para marcar"</string>
<string name="onscreenHoldText" msgid="2285258239691145872">"Retener"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 8ab0d63..9700e4b 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -519,7 +519,7 @@
<string name="dial_emergency_calling_not_available" msgid="5675557523782491826">"Appels d\'urgence non disponibles"</string>
<string name="police_type_description" msgid="5324410799919829693">"Police"</string>
<string name="ambulance_type_description" msgid="4114815025408089866">"Ambulance"</string>
- <string name="fire_type_description" msgid="7145996705197064710">"Feu"</string>
+ <string name="fire_type_description" msgid="7145996705197064710">"Pompiers"</string>
<string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</string>
<string name="dialerKeyboardHintText" msgid="9192914825413747792">"Utilisez le clavier pour composer un numéro."</string>
<string name="onscreenHoldText" msgid="2285258239691145872">"En attente"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index a9daf99..b475649 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -131,7 +131,7 @@
<string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"SS 요청이 USSD 요청으로 변경됨"</string>
<string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"새 SS 요청으로 변경됨"</string>
<string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"SS 요청이 화상 통화로 변경됨"</string>
- <string name="fdn_check_failure" msgid="18200614306525434">"휴대전화 앱의 발신 제한 번호 설정을 사용하기 때문에 일부 통화 관련 기능이 작동되지 않습니다."</string>
+ <string name="fdn_check_failure" msgid="18200614306525434">"전화 앱의 발신 제한 번호 설정을 사용하기 때문에 일부 통화 관련 기능이 작동되지 않습니다."</string>
<string name="radio_off_error" msgid="2304459933248513376">"이러한 설정을 보려면 무선을 사용해야 합니다."</string>
<string name="close_dialog" msgid="2365884406356986917">"확인"</string>
<string name="enable" msgid="7248657275000173526">"사용"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 5214666..39745b1 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -547,8 +547,8 @@
<string-array name="tty_mode_entries">
<item msgid="512950011423868021">"TTY desativado"</item>
<item msgid="3971695875449640648">"TTY completo"</item>
- <item msgid="1937509904407445684">"TTY HCO"</item>
- <item msgid="5644925873488772224">"TTY VCO"</item>
+ <item msgid="1937509904407445684">"TTD HCO"</item>
+ <item msgid="5644925873488772224">"TTD VCO"</item>
</string-array>
<string name="dtmf_tones_title" msgid="5163153771291340803">"Tons DTMF"</string>
<string name="dtmf_tones_summary" msgid="3351820372864020331">"Definir duração dos tons DTMF"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 524145f..1ef48cb 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -519,7 +519,7 @@
<string name="dial_emergency_calling_not_available" msgid="5675557523782491826">"Hindi available ang emergency na pagtawag"</string>
<string name="police_type_description" msgid="5324410799919829693">"Pulis"</string>
<string name="ambulance_type_description" msgid="4114815025408089866">"Ambulansya"</string>
- <string name="fire_type_description" msgid="7145996705197064710">"Apoy"</string>
+ <string name="fire_type_description" msgid="7145996705197064710">"Sunog"</string>
<string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</string>
<string name="dialerKeyboardHintText" msgid="9192914825413747792">"Gamitin ang keyboard upang mag-dial"</string>
<string name="onscreenHoldText" msgid="2285258239691145872">"I-hold"</string>
diff --git a/src/com/android/phone/PhoneUtils.java b/src/com/android/phone/PhoneUtils.java
index 712b8cb..31477e7 100644
--- a/src/com/android/phone/PhoneUtils.java
+++ b/src/com/android/phone/PhoneUtils.java
@@ -912,6 +912,12 @@
// been assigned for the PUK unlock / SIM READY process.
app.setPukEntryProgressDialog(pd);
+ } else if ((app.getPUKEntryActivity() != null) && (state == MmiCode.State.FAILED)) {
+ createUssdDialog(app, context, text,
+ WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG);
+ // In case of failure to unlock, we'll need to reset the
+ // PUK unlock activity, so that the user may try again.
+ app.setPukEntryActivity(null);
} else {
// In case of failure to unlock, we'll need to reset the
// PUK unlock activity, so that the user may try again.
@@ -922,42 +928,8 @@
// A USSD in a pending state means that it is still
// interacting with the user.
if (state != MmiCode.State.PENDING) {
- log("displayMMIComplete: MMI code has finished running.");
-
- log("displayMMIComplete: Extended NW displayMMIInitiate (" + text + ")");
- if (text == null || text.length() == 0)
- return;
-
- // displaying system alert dialog on the screen instead of
- // using another activity to display the message. This
- // places the message at the forefront of the UI.
-
- if (sUssdDialog == null) {
- sUssdDialog = new AlertDialog.Builder(context, THEME)
- .setPositiveButton(R.string.ok, null)
- .setCancelable(true)
- .setOnDismissListener(new DialogInterface.OnDismissListener() {
- @Override
- public void onDismiss(DialogInterface dialog) {
- sUssdMsg.setLength(0);
- }
- })
- .create();
-
- sUssdDialog.getWindow().setType(
- WindowManager.LayoutParams.TYPE_SYSTEM_ALERT);
- sUssdDialog.getWindow().addFlags(
- WindowManager.LayoutParams.FLAG_DIM_BEHIND);
- }
- if (sUssdMsg.length() != 0) {
- sUssdMsg
- .insert(0, "\n")
- .insert(0, app.getResources().getString(R.string.ussd_dialog_sep))
- .insert(0, "\n");
- }
- sUssdMsg.insert(0, text);
- sUssdDialog.setMessage(sUssdMsg.toString());
- sUssdDialog.show();
+ createUssdDialog(app, context, text,
+ WindowManager.LayoutParams.TYPE_SYSTEM_ALERT);
} else {
log("displayMMIComplete: USSD code has requested user input. Constructing input "
+ "dialog.");
@@ -1071,6 +1043,46 @@
}
}
+ private static void createUssdDialog(PhoneGlobals app, Context context, CharSequence text,
+ int windowType) {
+ log("displayMMIComplete: MMI code has finished running.");
+
+ log("displayMMIComplete: Extended NW displayMMIInitiate (" + text + ")");
+ if (text == null || text.length() == 0) {
+ return;
+ }
+
+ // displaying system alert dialog on the screen instead of
+ // using another activity to display the message. This
+ // places the message at the forefront of the UI.
+
+ if (sUssdDialog == null) {
+ sUssdDialog = new AlertDialog.Builder(context, THEME)
+ .setPositiveButton(R.string.ok, null)
+ .setCancelable(true)
+ .setOnDismissListener(new DialogInterface.OnDismissListener() {
+ @Override
+ public void onDismiss(DialogInterface dialog) {
+ sUssdMsg.setLength(0);
+ }
+ })
+ .create();
+
+ sUssdDialog.getWindow().setType(windowType);
+ sUssdDialog.getWindow().addFlags(
+ WindowManager.LayoutParams.FLAG_DIM_BEHIND);
+ }
+ if (sUssdMsg.length() != 0) {
+ sUssdMsg
+ .insert(0, "\n")
+ .insert(0, app.getResources().getString(R.string.ussd_dialog_sep))
+ .insert(0, "\n");
+ }
+ sUssdMsg.insert(0, text);
+ sUssdDialog.setMessage(sUssdMsg.toString());
+ sUssdDialog.show();
+ }
+
/**
* Cancels the current pending MMI operation, if applicable.
* @return true if we canceled an MMI operation, or false