From 70be315247d92cc8f30d0e9e7a984a0e52cd233a Mon Sep 17 00:00:00 2001
From: Marcos Marado <mmarado@cyngn.com>
Date: Wed, 19 Nov 2014 18:27:48 +0000
Subject: InCallUI: Validate function return value to avoid NPE

Change-Id: I265860937d9489ef52934be759637a868349a23e
---
 src/com/android/incallui/ConferenceManagerPresenter.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/com/android/incallui/ConferenceManagerPresenter.java b/src/com/android/incallui/ConferenceManagerPresenter.java
index 0535bda1..8a5451a1 100644
--- a/src/com/android/incallui/ConferenceManagerPresenter.java
+++ b/src/com/android/incallui/ConferenceManagerPresenter.java
@@ -90,6 +90,11 @@ public class ConferenceManagerPresenter
     private void initParticipantList(CallList callList) {
         mParticipantList = null;
         Call call = callList.getActiveOrBackgroundCall();
+        // getActiveOrBackgroundCall will return null if there are no calls
+        if (call == null) {
+            mNumCallersInConference = 0;
+            return;
+        }
 
         if (isImsCall(call)) {
             String[] confParticipantList = call.getCallDetails().getConfParticipantList();
-- 
cgit v1.2.3


From e11ea97b201397124550de04684e626652234cee Mon Sep 17 00:00:00 2001
From: Michael Bestas <mikeioannina@gmail.com>
Date: Thu, 27 Nov 2014 14:14:38 +0200
Subject: Automatic translation import

Change-Id: I56c76c398bb603c99f6bafc8c219e335696ce573
---
 res/values-ro/cm_strings.xml | 31 +++++++++++++++++++++++++++++++
 res/values-sv/cm_strings.xml | 11 +++++++++++
 2 files changed, 42 insertions(+)

diff --git a/res/values-ro/cm_strings.xml b/res/values-ro/cm_strings.xml
index 464c47c5..78350ace 100644
--- a/res/values-ro/cm_strings.xml
+++ b/res/values-ro/cm_strings.xml
@@ -17,6 +17,32 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="callFailed_dialToUssd">Cererea APEL a fost modificată în cerere USSD.</string>
+  <string name="callFailed_dialToSs">Cererea APEL a fost modificată în cerere SS.</string>
+  <string name="callFailed_dialToDial">Cererea APEL a fost modificată pentru APEL cu un număr diferit.</string>
+  <string name="callFailed_incoming_cb_enabled">Apelatul a blocat toate apelurile primite.</string>
+  <string name="callUnanswered_forwarded">Apel nerăspuns și transmis mai departe</string>
+  <string name="modify_call_prompt_yes">Da</string>
+  <string name="modify_call_prompt_no">Nu</string>
+  <string name="modify_call_failure_str">Cererea de modificare a apelului a eșuat\n</string>
+  <string name="modify_call_option_title">Selectaţi tipul de apel</string>
+  <string name="modify_call_option_vt">VT</string>
+  <string name="modify_call_option_vt_tx">Transmisie video</string>
+  <string name="modify_call_option_vt_rx">Recepție video</string>
+  <string name="modify_call_option_voice">Numai voce</string>
+  <string name="accept_modify_call_request_prompt">Acceptați cererea de modificare a apelului?</string>
+  <string name="upgrade_vt_prompt">Doriți să transformați din apel în apel video?</string>
+  <string name="upgrade_vt_tx_prompt">Doriți să transformați din apel în apel doar de transmisie video?</string>
+  <string name="upgrade_vt_rx_prompt">Doriți să transformați din apel în apel doar de recepție video?</string>
+  <string name="onscreenModifyCallText">Modificare apel</string>
+  <string name="onscreenAddParticipant">Adaugă participant</string>
+  <string name="description_target_answer_video">Răspunde cu video</string>
+  <string name="description_target_answer_tx_video">Răspunde cu TX video</string>
+  <string name="description_target_answer_rx_video">Răspunde cu RX video</string>
+  <string name="description_direction_up_right">Sus dreapta</string>
+  <string name="description_direction_up_left">Sus stânga</string>
+  <string name="description_direction_down_left">Jos stânga</string>
+  <string name="description_direction_down_right">Jos dreapta</string>
   <string name="incall_call_type_label_forwarded">Apel redirecționat</string>
   <string name="card_title_dialing_waiting">Apelez (așteptați\u2026)</string>
   <string name="card_title_waiting_call">Apel în așteptare</string>
@@ -25,4 +51,9 @@
   <string name="call_recording_failed_message">Înregistrarea apelului a eșuat</string>
   <string name="blacklist_dialog_title">Adaugă la lista neagră</string>
   <string name="blacklist_dialog_message">Viitoarele apeluri de la <xliff:g id="number">%s</xliff:g> vor fi blocate</string>
+  <string name="sub_1">SIM 1</string>
+  <string name="sub_2">SIM 2</string>
+  <string name="volume_boost_notify_enabled">Îmbunătățirea de volumul este activată</string>
+  <string name="volume_boost_notify_disabled">Îmbunătățirea de volumul este dezactivată</string>
+  <string name="volume_boost_notify_unavailable">Volumul suplimentar nu este disponibil atunci când utilizaţi un set de caști</string>
 </resources>
diff --git a/res/values-sv/cm_strings.xml b/res/values-sv/cm_strings.xml
index 64034e63..4ada9156 100644
--- a/res/values-sv/cm_strings.xml
+++ b/res/values-sv/cm_strings.xml
@@ -17,7 +17,16 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="callUnanswered_forwarded">Samtal obesvarat och vidarebefordrat</string>
   <string name="modify_call_prompt_yes">Ja</string>
+  <string name="modify_call_prompt_no">Nej</string>
+  <string name="modify_call_option_title">Välj samtalstyp</string>
+  <string name="modify_call_option_vt">VT</string>
+  <string name="modify_call_option_vt_tx">Videosändning</string>
+  <string name="modify_call_option_voice">Endast röst</string>
+  <string name="upgrade_vt_prompt">Vill du uppgradera samtalet till videosamtal?</string>
+  <string name="description_target_answer_tx_video">Svara med TX-video</string>
+  <string name="description_target_answer_rx_video">Svara med RX-video</string>
   <string name="incall_call_type_label_forwarded">Vidarebefordrat samtal</string>
   <string name="card_title_dialing_waiting">Ringer (väntar\u2026)</string>
   <string name="card_title_waiting_call">Väntande samtal</string>
@@ -26,4 +35,6 @@
   <string name="call_recording_failed_message">Det gick inte att starta samtalsinspelning</string>
   <string name="blacklist_dialog_title">Lägg till svartlistan</string>
   <string name="blacklist_dialog_message">Kommande samtal från <xliff:g id="number">%s</xliff:g> kommer att blockeras</string>
+  <string name="sub_1">SIM 1</string>
+  <string name="sub_2">SIM 2</string>
 </resources>
-- 
cgit v1.2.3


From 71867d6488d75f2e4d61ddb80bb0595b146f90aa Mon Sep 17 00:00:00 2001
From: Michael Bestas <mikeioannina@gmail.com>
Date: Sat, 20 Dec 2014 04:21:47 +0200
Subject: Automatic translation import

Change-Id: I9140bf4f116d6424c461b8f89c647b246e3b014f
---
 res/values-lb/cm_strings.xml | 14 ++++++++++++++
 res/values-lb/strings.xml    | 16 ----------------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/res/values-lb/cm_strings.xml b/res/values-lb/cm_strings.xml
index e87d932c..9c354795 100644
--- a/res/values-lb/cm_strings.xml
+++ b/res/values-lb/cm_strings.xml
@@ -30,16 +30,30 @@
   <string name="modify_call_option_vt_tx">Video iwwerdroen</string>
   <string name="modify_call_option_vt_rx">Video empfänken</string>
   <string name="modify_call_option_voice">Just Stëmm</string>
+  <string name="accept_modify_call_request_prompt">Ufro fir den Urufftyp z\'änneren acceptéieren?</string>
   <string name="upgrade_vt_prompt">Soll den Uruff an e Videouruff geännert ginn?</string>
   <string name="upgrade_vt_tx_prompt">Soll den Uruff an e Videouruff (just schécken) geännert ginn?</string>
+  <string name="upgrade_vt_rx_prompt">Soll den Uruff an e Videouruff (just empfänken) geännert ginn?</string>
+  <string name="onscreenModifyCallText">Uruff änneren</string>
+  <string name="onscreenAddParticipant">Weidere Korrespondent</string>
+  <string name="description_target_answer_video">Mat Video äntwerten</string>
+  <string name="description_target_answer_tx_video">Mat Video äntwerten (just schécken)</string>
+  <string name="description_target_answer_rx_video">Mat Video äntwerten (just empfänken)</string>
   <string name="description_direction_up_right">Uewe riets</string>
   <string name="description_direction_up_left">Uewe lénks</string>
   <string name="description_direction_down_left">Ënne lénks</string>
+  <string name="description_direction_down_right">Ënne riets</string>
   <string name="incall_call_type_label_forwarded">Weidergeleeten Uruff</string>
+  <string name="card_title_dialing_waiting">Gëtt gewielt (waart\u2026)</string>
   <string name="card_title_waiting_call">Waardenden Uruff</string>
   <string name="onscreenBlacklistText">Schwaarz Lëscht</string>
   <string name="onscreenRecordText">Opnam starten/stoppen</string>
   <string name="call_recording_failed_message">D\'Opnam vum Uruff konnt net gestart ginn</string>
   <string name="blacklist_dialog_title">Op d\'schwaarz Lëscht setzen</string>
   <string name="blacklist_dialog_message">An Zukunft ginn Uriff vun der Nummer <xliff:g id="number">%s</xliff:g> blockéiert</string>
+  <string name="sub_1">SIM 1</string>
+  <string name="sub_2">SIM 2</string>
+  <string name="volume_boost_notify_enabled">Lautstäerktamplifikatioun ass aktivéiert</string>
+  <string name="volume_boost_notify_disabled">Lautstäerktamplifikatioun ass desaktivéiert</string>
+  <string name="volume_boost_notify_unavailable">D\'Amplifikation vun der Lautstäerkt ass net disponibel wann s du Kopfhörer benotz</string>
 </resources>
diff --git a/res/values-lb/strings.xml b/res/values-lb/strings.xml
index 99bd4db7..4ec7e54e 100644
--- a/res/values-lb/strings.xml
+++ b/res/values-lb/strings.xml
@@ -17,7 +17,6 @@
   -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="phoneAppLabel" product="default">Telefon</string>
-  <string name="inCallLabel" translate="false">InCallUI</string>
   <string name="onHold">Gehalen</string>
   <string name="unknown">Onbekannt</string>
   <string name="private_num">Privat Nummer</string>
@@ -172,19 +171,4 @@
   <string name="dialpad_3_number">3</string>
   <string name="dialpad_4_number">4</string>
   <string name="dialpad_5_number">5</string>
-  <string name="dialpad_6_number">6</string>
-  <string name="dialpad_7_number">7</string>
-  <string name="dialpad_8_number">8</string>
-  <string name="dialpad_9_number">9</string>
-  <string name="dialpad_star_number">*</string>
-  <string name="dialpad_pound_number">#</string>
-  <string name="dialpad_0_letters">+</string>
-  <string name="dialpad_2_letters">ABC</string>
-  <string name="dialpad_3_letters">DEF</string>
-  <string name="dialpad_4_letters">GHI</string>
-  <string name="dialpad_5_letters">JKL</string>
-  <string name="dialpad_6_letters">MNO</string>
-  <string name="dialpad_7_letters">PQRS</string>
-  <string name="dialpad_8_letters">TUV</string>
-  <string name="dialpad_9_letters">WXYZ</string>
 </resources>
-- 
cgit v1.2.3