Merge "Add packages based upon carrier config rule" into sc-v2-dev
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 9cc5b99..59b3503 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -664,7 +664,7 @@
<string name="contactPhoto" msgid="7885089213135154834">"కాంటాక్ట్ ఫోటో"</string>
<string name="goPrivate" msgid="4645108311382209551">"ప్రైవేట్గా వెళ్లు"</string>
<string name="selectContact" msgid="1527612842599767382">"కాంటాక్ట్ను ఎంచుకోండి"</string>
- <string name="not_voice_capable" msgid="2819996734252084253">"వాయిస్ కాలింగ్కు మద్దతు లేదు"</string>
+ <string name="not_voice_capable" msgid="2819996734252084253">"వాయిస్ కాలింగ్కు సపోర్ట్ లేదు"</string>
<string name="description_dial_button" msgid="8614631902795087259">"డయల్ చేయి"</string>
<string name="description_dialpad_button" msgid="7395114120463883623">"డయల్ప్యాడ్ను చూపు"</string>
<string name="pane_title_emergency_dialpad" msgid="3627372514638694401">"అత్యవసర డయల్ప్యాడ్"</string>
@@ -890,9 +890,9 @@
<string name="radio_info_ppp_resets_label" msgid="9131901102339077661">"బూట్ చేసినప్పటి నుండి PPP రీసెట్ సంఖ్య:"</string>
<string name="radio_info_current_network_label" msgid="3052098695239642450">"ప్రస్తుత నెట్వర్క్:"</string>
<string name="radio_info_ppp_received_label" msgid="5753592451640644889">"స్వీకరించిన డేటా:"</string>
- <string name="radio_info_gsm_service_label" msgid="6443348321714241328">"వాయిస్ సేవ:"</string>
+ <string name="radio_info_gsm_service_label" msgid="6443348321714241328">"వాయిస్ సర్వీస్:"</string>
<string name="radio_info_signal_strength_label" msgid="5545444702102543260">"సిగ్నల్ సామర్థ్యం:"</string>
- <string name="radio_info_call_status_label" msgid="7693575431923095487">"వాయిస్ కాల్ స్థితి:"</string>
+ <string name="radio_info_call_status_label" msgid="7693575431923095487">"వాయిస్ కాల్ స్టేటస్:"</string>
<string name="radio_info_ppp_sent_label" msgid="6542208429356199695">"పంపిన డేటా:"</string>
<string name="radio_info_message_waiting_label" msgid="1886549432566952078">"సందేశ నిరీక్షణ:"</string>
<string name="radio_info_phone_number_label" msgid="2533852539562512203">"ఫోన్ నంబర్:"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 0e697da..f2e94dd 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -579,7 +579,7 @@
<string name="onscreenEndCallText" msgid="6138725377654842757">"สิ้นสุด"</string>
<string name="onscreenShowDialpadText" msgid="658465753816164079">"แป้นหมายเลข"</string>
<string name="onscreenMuteText" msgid="5470306116733843621">"ปิดเสียง"</string>
- <string name="onscreenAddCallText" msgid="9075675082903611677">"เพิ่มการโทร"</string>
+ <string name="onscreenAddCallText" msgid="9075675082903611677">"เพิ่มสาย"</string>
<string name="onscreenMergeCallsText" msgid="3692389519611225407">"รวมสาย"</string>
<string name="onscreenSwapCallsText" msgid="2682542150803377991">"สลับ"</string>
<string name="onscreenManageCallsText" msgid="1162047856081836469">"จัดการการโทร"</string>
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 6f36f51..fcb1764 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -2055,7 +2055,8 @@
case CMD_PREPARE_UNATTENDED_REBOOT:
request = (MainThreadRequest) msg.obj;
request.result =
- UiccController.getInstance().getPinStorage().prepareUnattendedReboot();
+ UiccController.getInstance().getPinStorage()
+ .prepareUnattendedReboot(request.workSource);
notifyRequester(request);
break;
@@ -10896,11 +10897,12 @@
@Override
@TelephonyManager.PrepareUnattendedRebootResult
public int prepareForUnattendedReboot() {
+ WorkSource workSource = getWorkSource(Binder.getCallingUid());
enforceRebootPermission();
final long identity = Binder.clearCallingIdentity();
try {
- return (int) sendRequest(CMD_PREPARE_UNATTENDED_REBOOT, null);
+ return (int) sendRequest(CMD_PREPARE_UNATTENDED_REBOOT, null, workSource);
} finally {
Binder.restoreCallingIdentity(identity);
}