Merge "Use a common multi tab settings file" into mnc-dev
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2395cd1..80f2247 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -124,6 +124,7 @@
<uses-permission android:name="com.android.voicemail.permission.READ_VOICEMAIL" />
<uses-permission android:name="android.permission.LOCAL_MAC_ADDRESS" />
<uses-permission android:name="android.permission.CHANGE_COMPONENT_ENABLED_STATE" />
+ <uses-permission android:name="android.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST" />
<!-- This tells the activity manager to not delay any of our activity
diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml
index ec588e1..86f2712 100644
--- a/res/values-gu-rIN/strings.xml
+++ b/res/values-gu-rIN/strings.xml
@@ -134,7 +134,7 @@
<string-array name="clir_display_values">
<item msgid="5560134294467334594">"નેટવર્ક ડિફોલ્ટ"</item>
<item msgid="7876195870037833661">"નંબર છુપાવો"</item>
- <item msgid="1108394741608734023">"નંબર દર્શાવો"</item>
+ <item msgid="1108394741608734023">"નંબર બતાવો"</item>
</string-array>
<string name="vm_changed" msgid="380744030726254139">"વૉઇસમેઇલ નંબર બદલ્યો."</string>
<string name="vm_change_failed" msgid="3352934863246208918">"વૉઇસમેઇલ નંબર બદલી શકાયો નથી.\nજો આ સમસ્યા ચાલુ રહે છે, તો તમારા કેરિઅરનો સંપર્ક કરો."</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 3052a06..9a74a14 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -139,7 +139,7 @@
<string name="vm_changed" msgid="380744030726254139">"ボイスメールの番号が変更されました。"</string>
<string name="vm_change_failed" msgid="3352934863246208918">"ボイスメール番号を変更できませんでした。\nこの問題が続くようであれば携帯通信会社にお問い合わせください。"</string>
<string name="fw_change_failed" msgid="5298103228470214665">"転送番号を変更できませんでした。\nこの問題が続くようであれば携帯通信会社にお問い合わせください。"</string>
- <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"現在の転送先番号設定の取得と保存ができませんでした。\n別の携帯通信会社に切り替えますか？"</string>
+ <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"現在の転送先番号設定の取得と保存ができませんでした。\nかまわず新しい携帯通信会社に切り替えますか？"</string>
<string name="no_change" msgid="3186040086622435212">"変更されていません。"</string>
<string name="sum_voicemail_choose_provider" msgid="59911196126278922">"ボイスメールサービスを選択"</string>
<string name="voicemail_default" msgid="2001233554889016880">"携帯通信会社"</string>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 964c89a..bd1be54 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -269,9 +269,9 @@
<string name="enable_disable_local_weather" msgid="986967454867219114">"ಸ್ಥಳೀಯ ಹವಾಮಾನ"</string>
<string name="local_weather_enable" msgid="6199315114382448922">"ಸ್ಥಳೀಯ ಹವಾಮಾನ ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
<string name="local_weather_disable" msgid="2510158089142626480">"ಸ್ಥಳೀಯ ಹವಾಮಾನ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
- <string name="enable_disable_atr" msgid="8339572391278872343">"ಪ್ರದೇಶ ದಟ್ಟಣೆ ವರದಿಗಳು"</string>
- <string name="atr_enable" msgid="5541757457789181799">"ಪ್ರದೇಶ ದಟ್ಟಣೆ ವರದಿಗಳು ಸಕ್ರಿಯಗೊಂಡಿವೆ"</string>
- <string name="atr_disable" msgid="7085558154727596455">"ಪ್ರದೇಶ ದಟ್ಟಣೆ ವರದಿಗಳು ನಿಷ್ಕ್ರಿಯಗೊಂಡಿವೆ"</string>
+ <string name="enable_disable_atr" msgid="8339572391278872343">"ಪ್ರದೇಶ ಟ್ರಾಫಿಕ್‌ ವರದಿಗಳು"</string>
+ <string name="atr_enable" msgid="5541757457789181799">"ಪ್ರದೇಶ ಟ್ರಾಫಿಕ್‌ ವರದಿಗಳು ಸಕ್ರಿಯಗೊಂಡಿವೆ"</string>
+ <string name="atr_disable" msgid="7085558154727596455">"ಪ್ರದೇಶ ಟ್ರಾಫಿಕ್‌ ವರದಿಗಳು ನಿಷ್ಕ್ರಿಯಗೊಂಡಿವೆ"</string>
<string name="enable_disable_lafs" msgid="668189073721277199">"ಸ್ಥಳೀಯ ವಿಮಾನ ನಿಲ್ದಾಣ ಹಾರಾಟದ ವೇಳಾಪಟ್ಟಿ"</string>
<string name="lafs_enable" msgid="2791978667205137052">"ಸ್ಥಳೀಯ ವಿಮಾನ ನಿಲ್ದಾಣದ ಹಾರಾಟ ವೇಳಾಪಟ್ಟಿಯನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
<string name="lafs_disable" msgid="2391212397725495350">"ಸ್ಥಳೀಯ ವಿಮಾನ ನಿಲ್ದಾಣದ ಹಾರಾಟ ವೇಳಾಪಟ್ಟಿಯನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index d506bd1..5abee72 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -70,7 +70,7 @@
<string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"അക്കൗണ്ട് ക്രമീകരണങ്ങൾ കോൺഫിഗർചെയ്യുക"</string>
<string name="phone_accounts_all_calling_accounts" msgid="207619531589278471">"എല്ലാ കോളിംഗ് അക്കൗണ്ടുകളും"</string>
<string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"ഫോൺ വിളിക്കാനാകുന്ന അക്കൗണ്ടുകൾ തിരഞ്ഞെടുക്കുക"</string>
- <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi കോളിംഗ്"</string>
+ <string name="wifi_calling" msgid="739018212480165598">"വൈഫൈ കോളിംഗ്"</string>
<string name="connection_service_default_label" msgid="1498481943805913754">"അന്തർ നിർമ്മിത കണക്ഷൻ സേവനം"</string>
<string name="voicemail" msgid="8693759337917898954">"വോയ്സ് മെയില്"</string>
<string name="voicemail_settings_with_label" msgid="152724978380748296">"ശബ്ദമെയിൽ(<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
@@ -480,7 +480,7 @@
<string name="ota_hfa_activation_title" msgid="2234246934160473981">"സജീവമാക്കുന്നു..."</string>
<string name="ota_hfa_activation_dialog_message" msgid="8092479227918463415">"ഫോൺ നിങ്ങളുടെ മൊബൈൽ ഡാറ്റ സേവനം സജീവമാക്കുന്നു.\n\nഇതിന് 5 മിനിറ്റ് വരെയെടുക്കാം."</string>
<string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"സജീവമാക്കൽ ഒഴിവാക്കണോ?"</string>
- <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"നിങ്ങൾ സജീവമാക്കൽ ഒഴിവാക്കുകയാണെങ്കിൽ, നിങ്ങൾക്ക് കോളുകൾ വിളിക്കാനോ മൊബൈൽ ഡാറ്റ നെറ്റ്വർക്കുകളിൽ കണക്റ്റുചെയ്യാനോ കഴിയില്ല (എങ്കിലും നിങ്ങൾക്ക് Wi-Fi നെറ്റ്വർക്കുകളിൽ കണക്റ്റുചെയ്യാം). നിങ്ങളുടെ ഫോൺ സജീവമാക്കുന്നതുവരെ, അത് ഓൺ ചെയ്യുമ്പോഴെല്ലാം സജീവമാക്കാൻ നിങ്ങളോട് ആവശ്യപ്പെടും."</string>
+ <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"നിങ്ങൾ സജീവമാക്കൽ ഒഴിവാക്കുകയാണെങ്കിൽ, നിങ്ങൾക്ക് കോളുകൾ വിളിക്കാനോ മൊബൈൽ ഡാറ്റ നെറ്റ്വർക്കുകളിൽ കണക്റ്റുചെയ്യാനോ കഴിയില്ല (എങ്കിലും നിങ്ങൾക്ക് വൈഫൈ നെറ്റ്വർക്കുകളിൽ കണക്റ്റുചെയ്യാം). നിങ്ങളുടെ ഫോൺ സജീവമാക്കുന്നതുവരെ, അത് ഓൺ ചെയ്യുമ്പോഴെല്ലാം സജീവമാക്കാൻ നിങ്ങളോട് ആവശ്യപ്പെടും."</string>
<string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"ഒഴിവാക്കുക"</string>
<string name="ota_activate" msgid="1368528132525626264">"സജീവമാക്കുക"</string>
<string name="ota_title_activate_success" msgid="6570240212263372046">"ഫോൺ സജീവമാക്കി."</string>
@@ -540,8 +540,8 @@
<string name="sim_description_emergency_calls" msgid="7535215397212301562">"അടിയന്തിര കോൾചെയ്യൽ മാത്രം"</string>
<string name="sim_description_default" msgid="4778679519938775515">"SIM കാർഡ്, സ്ലോട്ട്: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
<string name="accessibility_settings_activity_title" msgid="8562004288733103868">"പ്രവേശനക്ഷമത"</string>
- <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"ഇൻകമിംഗ് Wi-Fi കോൾ"</string>
- <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi കോൾ"</string>
+ <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"ഇൻകമിംഗ് വൈഫൈ കോൾ"</string>
+ <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"വൈഫൈ കോൾ"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"തുറക്കുന്നതിന് വീണ്ടും സ്പർശിക്കുക"</string>
<string name="message_decode_error" msgid="3456481534066924855">"സന്ദേശം ഡീകോഡുചെയ്യുമ്പോൾ ഒരു പിശകുണ്ടായി."</string>
<string name="callFailed_cdma_activation" msgid="2307989779233262164">"ഒരു SIM കാർഡ് നിങ്ങളുടെ സേവനം സജീവമാക്കി, ഫോണിന്റെ റോമിംഗ് ശേഷികൾ അപ്ഡേറ്റ് ചെയ്തു."</string>
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml
index cc9cd02..4931375 100644
--- a/res/values-sq-rAL/strings.xml
+++ b/res/values-sq-rAL/strings.xml
@@ -125,7 +125,7 @@
<string name="reverting_settings" msgid="4752151682666912828">"Po rikthen cilësimet…"</string>
<string name="response_error" msgid="6674110501330139405">"Përgjigje e papritur nga rrjeti."</string>
<string name="exception_error" msgid="7027667130619518211">"Gabim në rrjet ose në kartën SIM."</string>
- <string name="fdn_check_failure" msgid="18200614306525434">"Cilësimet e numrave fiks të aplikacionit të telefonit tënd janë aktivizuar. Si rezultat, disa funksione që lidhen me telefonatën nuk funksionojnë."</string>
+ <string name="fdn_check_failure" msgid="18200614306525434">"Cilësimi për numrat me telefonim të përzgjedhur të aplikacionit të telefonit tënd u aktivizua. Si rezultat, disa funksione që kanë të bëjnë me telefonimin nuk funksionojnë."</string>
<string name="radio_off_error" msgid="2304459933248513376">"Aktivizo radion para se të shohësh këto cilësime."</string>
<string name="close_dialog" msgid="2365884406356986917">"Në rregull"</string>
<string name="enable" msgid="7248657275000173526">"Aktivizo"</string>
@@ -326,19 +326,19 @@
<string name="cdma_activate_device" msgid="3793805892364814518">"Aktivizo"</string>
<string name="cdma_lte_data_service" msgid="4255018217292548962">"Konfiguro shërbimin e të dhënave"</string>
<string name="carrier_settings_title" msgid="9028166176523012300">"Cilësimet e operatorit"</string>
- <string name="fdn" msgid="7878832555095183202">"Numrat e telefonave fiks"</string>
- <string name="fdn_with_label" msgid="187084204115493366">"Numrat e telefonave fiks (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+ <string name="fdn" msgid="7878832555095183202">"Numrat me telefonim të përzgjedhur"</string>
+ <string name="fdn_with_label" msgid="187084204115493366">"Numrat me telefonim të përzgjedhur (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="manage_fdn_list" msgid="8777755791892122369">"Lista e FDN-ve"</string>
- <string name="fdn_list_with_label" msgid="7437232552210469217">"Lista e FDN-ve (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
- <string name="fdn_activation" msgid="2156479741307463576">"Aktivizimi FDN"</string>
- <string name="fdn_enabled" msgid="5238109009915521240">"Numrat e telefonave fiks u aktivizuan"</string>
- <string name="fdn_disabled" msgid="4700049736675368279">"Numrat e telefonave fiks u çaktivizuan"</string>
+ <string name="fdn_list_with_label" msgid="7437232552210469217">"Lista e FDN-së (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+ <string name="fdn_activation" msgid="2156479741307463576">"Aktivizimi i FDN-së"</string>
+ <string name="fdn_enabled" msgid="5238109009915521240">"Numrat me telefonim të përzgjedhur u aktivizuan"</string>
+ <string name="fdn_disabled" msgid="4700049736675368279">"Numrat me telefonim të përzgjedhur u çaktivizuan"</string>
<string name="enable_fdn" msgid="3740191529180493851">"Aktivizo FDN-në"</string>
<string name="disable_fdn" msgid="7944020890722540616">"Çaktivizo FDN-në"</string>
<string name="change_pin2" msgid="2153563695382176676">"Ndrysho PIN2-shin"</string>
<string name="enable_fdn_ok" msgid="7215588870329688132">"Çaktivizo FDN-në"</string>
<string name="disable_fdn_ok" msgid="5727046928930740173">"Aktivizo FDN-në"</string>
- <string name="sum_fdn" msgid="1959399454900272878">"Menaxho numrat e telefonave fiks"</string>
+ <string name="sum_fdn" msgid="1959399454900272878">"Menaxho numrat me telefonim të përzgjedhur"</string>
<string name="sum_fdn_change_pin" msgid="6666549734792827932">"Ndrysho PIN-in për qasje te FDN-ja"</string>
<string name="sum_fdn_manage_list" msgid="8431088265332628316">"Menaxho listën e numrave të telefonit"</string>
<string name="voice_privacy" msgid="3776841382844614716">"Privatësia e zërit"</string>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index d8c43b5..5b2a405 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -100,19 +100,19 @@
<string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"எல்லா அழைப்புகளையும் பகிர்"</string>
<string name="sum_cfu_enabled" msgid="2450052502198827927">"<xliff:g id="PHONENUMBER">{0}</xliff:g> க்கு எல்லா அழைப்புகளையும் பகிர்"</string>
<string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"எண் கிடைக்கவில்லை"</string>
- <string name="sum_cfu_disabled" msgid="8384177689501334080">"முடக்கு"</string>
+ <string name="sum_cfu_disabled" msgid="8384177689501334080">"முடக்கத்தில்"</string>
<string name="labelCFB" msgid="6139853033106283172">"பிஸியாக இருக்கும்போது"</string>
- <string name="messageCFB" msgid="3711089705936187129">"பிஸியாக இருக்கும்போது இதில்"</string>
+ <string name="messageCFB" msgid="3711089705936187129">"பிஸியாக இருக்கும்போது:"</string>
<string name="sum_cfb_enabled" msgid="5984198104833116690">"<xliff:g id="PHONENUMBER">{0}</xliff:g> க்குப் பகிர்"</string>
- <string name="sum_cfb_disabled" msgid="4913145177320506827">"முடக்கு"</string>
+ <string name="sum_cfb_disabled" msgid="4913145177320506827">"முடக்கத்தில்"</string>
<string name="disable_cfb_forbidden" msgid="3506984333877998061">"மொபைல் பிஸியாக இருக்கும்போது, அழைப்பு பகிர்தலை முடக்குவதை ஆபரேட்டர் ஆதரிக்கவில்லை."</string>
<string name="labelCFNRy" msgid="1736067178393744351">"பதிலளிக்காமல் இருக்கும்போது"</string>
- <string name="messageCFNRy" msgid="672317899884380374">"பதிலளிக்காதபோது இதில்"</string>
+ <string name="messageCFNRy" msgid="672317899884380374">"பதிலளிக்காதபோது:"</string>
<string name="sum_cfnry_enabled" msgid="6955775691317662910">"<xliff:g id="PHONENUMBER">{0}</xliff:g> க்குப் பகிர்"</string>
- <string name="sum_cfnry_disabled" msgid="3884684060443538097">"முடக்கு"</string>
+ <string name="sum_cfnry_disabled" msgid="3884684060443538097">"முடக்கத்தில்"</string>
<string name="disable_cfnry_forbidden" msgid="4308233959150658058">"பதிலளிக்காமல் இருக்கும்போது, அழைப்பு பகிர்தலை முடக்குவதை ஆபரேட்டர் ஆதரிக்கவில்லை."</string>
<string name="labelCFNRc" msgid="2614827454402079766">"தொடர்புகொள்ள முடியாமல் இருக்கும்போது"</string>
- <string name="messageCFNRc" msgid="6380695421020295119">"தொடர்பு கிடைக்காதபோது இதில்"</string>
+ <string name="messageCFNRc" msgid="6380695421020295119">"தொடர்பு கிடைக்காதபோது:"</string>
<string name="sum_cfnrc_enabled" msgid="7010898346095497421">"<xliff:g id="PHONENUMBER">{0}</xliff:g> க்குப் பகிர்"</string>
<string name="sum_cfnrc_disabled" msgid="7222141261321276464">"முடக்கப்பட்டது"</string>
<string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"மொபைல் தொடர்புகொள்ள முடியாத இடத்தில் இருக்கும்போது, அழைப்பு பகிர்தலை முடக்குவதை ஆபரேட்டர் ஆதரிக்கவில்லை."</string>
@@ -132,7 +132,7 @@
<string name="disable" msgid="4678348128118573672">"முடக்கு"</string>
<string name="change_num" msgid="239476305819844391">"புதுப்பி"</string>
<string-array name="clir_display_values">
- <item msgid="5560134294467334594">"நெட்வொர்க் இயல்பு"</item>
+ <item msgid="5560134294467334594">"நெட்வொர்க் பொருத்து"</item>
<item msgid="7876195870037833661">"எண்ணை மறை"</item>
<item msgid="1108394741608734023">"எண்ணைக் காட்டு"</item>
</string-array>
@@ -370,7 +370,7 @@
<string name="fdn_failed" msgid="540018079008319747">"FDN செயல்பாடு தோல்வி."</string>
<string name="simContacts_emptyLoading" msgid="2203331234764498011">"சிம் கார்டில் இருப்பதைப் படிக்கிறது…"</string>
<string name="simContacts_empty" msgid="5270660846489561932">"சிம் கார்டில் தொடர்புகள் இல்லை."</string>
- <string name="simContacts_title" msgid="1861472842524839921">"இறக்குமதிக்கு தொடர்புகளைத் தேர்ந்தெடுக்கவும்"</string>
+ <string name="simContacts_title" msgid="1861472842524839921">"ஏற்ற தொடர்புகளைத் தேர்ந்தெடு"</string>
<string name="simContacts_airplaneMode" msgid="5254946758982621072">"SIM கார்டிலிருந்து தொடர்புகளை இறக்க, விமானப் பயன்முறையை முடக்கவும்."</string>
<string name="enable_pin" msgid="5422767284133234860">"சிம்மின் பின்னை இயக்கு/முடக்கு"</string>
<string name="change_pin" msgid="9174186126330785343">"சிம்மின் பின்னை மாற்று"</string>
@@ -379,7 +379,7 @@
<string name="newPinLabel" msgid="207488227285336897">"புதிய பின்"</string>
<string name="confirmPinLabel" msgid="257597715098070206">"புதிய பின்னை உறுதிப்படுத்தவும்"</string>
<string name="badPin" msgid="8955102849303984935">"உள்ளிட்ட பழைய பின் தவறானது. மீண்டும் முயற்சிக்கவும்."</string>
- <string name="mismatchPin" msgid="5923253370683071889">"உள்ளிட்ட PINகள் பொருந்தவில்லை. மீண்டும் முயற்சிக்கவும்."</string>
+ <string name="mismatchPin" msgid="5923253370683071889">"உள்ளிட்ட பின்கள் பொருந்தவில்லை. மீண்டும் முயற்சிக்கவும்."</string>
<string name="invalidPin" msgid="5981171102258684792">"4 இலிருந்து 8 எண்கள் வரையுள்ள பின்னை உள்ளிடவும்."</string>
<string name="disable_sim_pin" msgid="3419351358300716472">"சிம் பின்னை அழி"</string>
<string name="enable_sim_pin" msgid="4845145659651484248">"சிம் பின்னை அமை"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1ce9e9c..52e4961 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -24,7 +24,7 @@
<!-- Official label of the phone app, as seen in "Manage Applications"
and other settings UIs. -->
- <string name="phoneAppLabel" product="default">Phone</string>
+ <string name="phoneAppLabel" product="default">Phone Services</string>
<!-- Screen title for Emergency Dialer UI -->
<string name="emergencyDialerIconLabel">Emergency Dialer</string>
diff --git a/sip/res/values-bg/strings.xml b/sip/res/values-bg/strings.xml
index b465464..7e5ac23 100644
--- a/sip/res/values-bg/strings.xml
+++ b/sip/res/values-bg/strings.xml
@@ -59,7 +59,7 @@
<string name="transport_title" msgid="889155457465372527">"Тип транспорт"</string>
<string name="send_keepalive_title" msgid="599627072150501159">"Изпращане на съобщение за проверка на връзката"</string>
<string name="advanced_settings" msgid="6622996380747040711">"Незадължителни настройки"</string>
- <string name="auth_username_title" msgid="8262491689004708265">"Потребителско име за удостоверяване"</string>
+ <string name="auth_username_title" msgid="8262491689004708265">"Потребит. име за удостоверяване"</string>
<string name="auth_username_summary" msgid="941160241371436473">"Потребителско име, използвано за удостоверяване"</string>
<string name="default_preference_summary" msgid="1979249643719483249">"<Не е зададено>"</string>
<string name="display_name_summary" msgid="7155076491675565407">"<Същото като потребителското име>"</string>
diff --git a/sip/res/values-fa/strings.xml b/sip/res/values-fa/strings.xml
index 00c5414..b35a965 100644
--- a/sip/res/values-fa/strings.xml
+++ b/sip/res/values-fa/strings.xml
@@ -20,7 +20,7 @@
<string name="sip_accounts" msgid="85559497282185405">"حسابهای SIP"</string>
<string name="sip_accounts_title" msgid="2082527045326874519">"حسابها"</string>
<string name="sip_receive_calls" msgid="426678617137462173">"دریافت تماسهای ورودی"</string>
- <string name="sip_receive_calls_summary" msgid="946161517528227523">"از نیروی باتری بیشتری استفاده میکند"</string>
+ <string name="sip_receive_calls_summary" msgid="946161517528227523">"از باتری بیشتری استفاده میکند"</string>
<string name="sip_call_options_title" msgid="8421210494703869806">"استفاده از تماس SIP"</string>
<string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"استفاده از تماس SIP (فقط Wi-Fi)"</string>
<string name="sip_call_options_entry_1" msgid="7217659161237099900">"برای همه تماسها وقتی شبکه داده در دسترس است"</string>
@@ -65,7 +65,7 @@
<string name="display_name_summary" msgid="7155076491675565407">"<مانند نام کاربری>"</string>
<string name="optional_summary" msgid="2363105560396317624">"<اختیاری>"</string>
<string name="advanced_settings_show" msgid="7838761602853998622">"▷ جهت نمایش همه لمس کنید"</string>
- <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ جهت پنهان کردن همه لمس کنید"</string>
+ <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ برای پنهان کردن همه لمس کنید"</string>
<string name="empty_alert" msgid="6659484914371384024">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> ضروری است و نباید خالی بماند."</string>
<string name="not_a_valid_port" msgid="7931422555587011830">"شماره درگاه باید بین ۱۰۰۰ و ۶۵۵۳۴ باشد."</string>
<string name="no_internet_available" msgid="5523747991760017298">"برای برقراری تماس SIP، ابتدا اتصال اینترنتتان را بررسی کنید."</string>
diff --git a/sip/res/values-gu-rIN/strings.xml b/sip/res/values-gu-rIN/strings.xml
index f1a5bca..40619d5 100644
--- a/sip/res/values-gu-rIN/strings.xml
+++ b/sip/res/values-gu-rIN/strings.xml
@@ -57,7 +57,7 @@
<string name="proxy_address_title" msgid="6890163365640631841">"આઉટબાઉન્ડ પ્રોક્સી સરનામું"</string>
<string name="port_title" msgid="6693965912656593862">"પોર્ટ નંબર"</string>
<string name="transport_title" msgid="889155457465372527">"સંક્રમણ પ્રકાર"</string>
- <string name="send_keepalive_title" msgid="599627072150501159">"જીવંત-રાખો મોકલો"</string>
+ <string name="send_keepalive_title" msgid="599627072150501159">"કીપ-અલાઇવ મોકલો"</string>
<string name="advanced_settings" msgid="6622996380747040711">"વૈકલ્પિક સેટિંગ્સ"</string>
<string name="auth_username_title" msgid="8262491689004708265">"પ્રમાણીકરણ વપરાશકર્તાનામ"</string>
<string name="auth_username_summary" msgid="941160241371436473">"પ્રમાણીકરણ માટે ઉપયોગમાં લેવાયેલ વપરાશકર્તાનામ"</string>
diff --git a/sip/res/values-kn-rIN/strings.xml b/sip/res/values-kn-rIN/strings.xml
index 0e89dd2..8d95917 100644
--- a/sip/res/values-kn-rIN/strings.xml
+++ b/sip/res/values-kn-rIN/strings.xml
@@ -47,7 +47,7 @@
<string name="registration_status_failed_try_later" msgid="2199970021756384317">"ಖಾತೆ ನೋಂದಣಿಯು ಯಶಸ್ವಿಯಾಗಿಲ್ಲ: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); ನಂತರ ಪ್ರಯತ್ನಿಸುತ್ತೇನೆ"</string>
<string name="registration_status_invalid_credentials" msgid="8406872554323334182">"ಖಾತೆ ನೋಂದಣಿಯು ಯಶಸ್ವಿಯಾಗಲಿಲ್ಲ: ಬಳಕೆದಾರರ ಹೆಸರು ಅಥವಾ ಪಾಸ್‌ವರ್ಡ್‌ ತಪ್ಪಾಗಿದೆ."</string>
<string name="registration_status_server_unreachable" msgid="7710275557045148634">"ಖಾತೆ ನೋಂದಣಿಯು ಯಶಸ್ವಿಯಾಗಲಿಲ್ಲ: ಸರ್ವರ್ ಹೆಸರನ್ನು ಪರಿಶೀಲಿಸಿ."</string>
- <string name="third_party_account_summary" msgid="9041060473615403041">"ಈ ಖಾತೆಯನ್ನು ಪ್ರಸ್ತುತವಾಗಿ <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> ಅಪ್ಲಿಕೇಶನ್‌ ಬಳಸುತ್ತಿದೆ."</string>
+ <string name="third_party_account_summary" msgid="9041060473615403041">"ಈ ಖಾತೆಯನ್ನು ಪ್ರಸ್ತುತ <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> ಅಪ್ಲಿಕೇಶನ್‌ ಬಳಸುತ್ತಿದೆ."</string>
<string name="sip_edit_title" msgid="1967247832635750410">"SIP ಖಾತೆ ವಿವರಗಳು"</string>
<string name="sip_edit_new_title" msgid="266414118302574305">"SIP ಖಾತೆ ವಿವರಗಳು"</string>
<string name="domain_address_title" msgid="1968479941328225423">"ಸರ್ವರ್"</string>
diff --git a/sip/res/values-ko/strings.xml b/sip/res/values-ko/strings.xml
index af1ed43..0f5b7db 100644
--- a/sip/res/values-ko/strings.xml
+++ b/sip/res/values-ko/strings.xml
@@ -48,8 +48,8 @@
<string name="registration_status_invalid_credentials" msgid="8406872554323334182">"계정을 등록하지 못했습니다. 사용자 이름 또는 비밀번호가 잘못되었습니다."</string>
<string name="registration_status_server_unreachable" msgid="7710275557045148634">"계정을 등록하지 못했습니다. 서버 이름을 확인하세요."</string>
<string name="third_party_account_summary" msgid="9041060473615403041">"<xliff:g id="ACCOUNT_OWNER">%s</xliff:g> 앱에서 현재 이 계정을 사용 중입니다."</string>
- <string name="sip_edit_title" msgid="1967247832635750410">"SIP 계정 세부정보"</string>
- <string name="sip_edit_new_title" msgid="266414118302574305">"SIP 계정 세부정보"</string>
+ <string name="sip_edit_title" msgid="1967247832635750410">"SIP 계정 정보"</string>
+ <string name="sip_edit_new_title" msgid="266414118302574305">"SIP 계정 정보"</string>
<string name="domain_address_title" msgid="1968479941328225423">"서버"</string>
<string name="username_title" msgid="6770064611005663470">"사용자 이름"</string>
<string name="password_title" msgid="5289013731515564295">"비밀번호"</string>
diff --git a/sip/res/values-ml-rIN/strings.xml b/sip/res/values-ml-rIN/strings.xml
index 87e2549..85b99aa 100644
--- a/sip/res/values-ml-rIN/strings.xml
+++ b/sip/res/values-ml-rIN/strings.xml
@@ -22,7 +22,7 @@
<string name="sip_receive_calls" msgid="426678617137462173">"ഇൻകമിംഗ് കോൾ സ്വീകരിക്കൂ"</string>
<string name="sip_receive_calls_summary" msgid="946161517528227523">"കൂടുതൽ ബാറ്ററി ആയുസ് ഉപയോഗിക്കുന്നു"</string>
<string name="sip_call_options_title" msgid="8421210494703869806">"SIP കോൾചെയ്യൽ ഉപയോഗിക്കുക"</string>
- <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"SIP കോൾചെയ്യൽ ഉപയോഗിക്കുക (Wi-Fi മാത്രം)"</string>
+ <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"SIP കോൾചെയ്യൽ ഉപയോഗിക്കുക (വൈഫൈ മാത്രം)"</string>
<string name="sip_call_options_entry_1" msgid="7217659161237099900">"ഡാറ്റ നെറ്റ്വർക്ക് ലഭ്യമാകുമ്പോൾ എല്ലാ കോളുകൾക്കായും"</string>
<string name="sip_call_options_entry_2" msgid="1815335903940609729">"SIP കോളുകൾക്ക് മാത്രം"</string>
<string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"എല്ലാ കോളുകൾക്കും"</string>
@@ -41,7 +41,7 @@
<string name="registration_status_still_trying" msgid="7648151061205513458">"ഇപ്പോഴും ശ്രമിക്കുന്നു…"</string>
<string name="registration_status_not_receiving" msgid="7620333886153361090">"കോളുകൾ സ്വീകരിക്കുന്നില്ല."</string>
<string name="registration_status_no_data" msgid="2541999976218192413">"ഇന്റർനെറ്റ് കണക്ഷനില്ലാത്താതിനാൽ അക്കൗണ്ട് രജിസ്ട്രേഷൻ നിർത്തിവച്ചു."</string>
- <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"Wi-Fi കണക്ഷനില്ലാത്താതിനാൽ അക്കൗണ്ട് രജിസ്ട്രേഷൻ നിർത്തിവച്ചു."</string>
+ <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"വൈഫൈ കണക്ഷനില്ലാത്താതിനാൽ അക്കൗണ്ട് രജിസ്ട്രേഷൻ നിർത്തിവച്ചു."</string>
<string name="registration_status_not_running" msgid="514205414303796800">"അക്കൗണ്ട് രജിസ്ട്രേഷൻ പരാജയപ്പെട്ടു."</string>
<string name="registration_status_done" msgid="3264961069247314253">"കോളുകൾ സ്വീകരിക്കുന്നു."</string>
<string name="registration_status_failed_try_later" msgid="2199970021756384317">"അക്കൗണ്ട് രജിസ്ട്രേഷൻ പരാജയപ്പെട്ടു: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); പിന്നീട് വീണ്ടും ശ്രമിക്കും"</string>
@@ -69,7 +69,7 @@
<string name="empty_alert" msgid="6659484914371384024">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> ആവശ്യമായതിനാൽ ശൂന്യമായിടാനാകില്ല."</string>
<string name="not_a_valid_port" msgid="7931422555587011830">"പോർട്ട് നമ്പർ 1000, 65534 എന്നിവയ്ക്കിടയിലായിരിക്കണം."</string>
<string name="no_internet_available" msgid="5523747991760017298">"SIP കോൾചെയ്യുന്നതിന്, ആദ്യം നിങ്ങളുടെ ഇന്റർനെറ്റ് കണക്ഷൻ പരിശോധിക്കുക."</string>
- <string name="no_wifi_available" msgid="1955023904229673488">"SIP കോളുകൾക്കായി Wi-Fi നെറ്റ്വർക്കിലേക്ക് കണക്റ്റുചെയ്യേണ്ടതുണ്ട് (വയർലെസ്, നെറ്റ്വർക്ക് ക്രമീകരണങ്ങൾ ഉപയോഗിക്കുക)."</string>
+ <string name="no_wifi_available" msgid="1955023904229673488">"SIP കോളുകൾക്കായി വൈഫൈ നെറ്റ്വർക്കിലേക്ക് കണക്റ്റുചെയ്യേണ്ടതുണ്ട് (വയർലെസ്, നെറ്റ്വർക്ക് ക്രമീകരണങ്ങൾ ഉപയോഗിക്കുക)."</string>
<string name="no_voip" msgid="3038021971231952704">"SIP കോൾചെയ്യൽ പിന്തുണയ്ക്കുന്നില്ല"</string>
<string name="sip_system_decide" msgid="5577696249416700671">"യാന്ത്രികമായി"</string>
<string name="sip_always_send_keepalive" msgid="4773022409239823318">"എല്ലായ്പ്പോഴും അയയ്ക്കുക"</string>
diff --git a/sip/res/values-mr-rIN/strings.xml b/sip/res/values-mr-rIN/strings.xml
index 59da732..66914f2 100644
--- a/sip/res/values-mr-rIN/strings.xml
+++ b/sip/res/values-mr-rIN/strings.xml
@@ -21,8 +21,8 @@
<string name="sip_accounts_title" msgid="2082527045326874519">"खाती"</string>
<string name="sip_receive_calls" msgid="426678617137462173">"येणारे कॉल प्राप्त करा"</string>
<string name="sip_receive_calls_summary" msgid="946161517528227523">"अधिक बॅटरी आयुष्य वापरते"</string>
- <string name="sip_call_options_title" msgid="8421210494703869806">"SIP कॉल करणे वापरा"</string>
- <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"SIP कॉल करणे वापरा (वाय-फाय केवळ)"</string>
+ <string name="sip_call_options_title" msgid="8421210494703869806">"SIP कॉलिंग वापरा"</string>
+ <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"SIP कॉलिंग वापरा (वाय-फाय केवळ)"</string>
<string name="sip_call_options_entry_1" msgid="7217659161237099900">"डेटा नेटवर्क उपलब्ध असल्यावर सर्व कॉलसाठी"</string>
<string name="sip_call_options_entry_2" msgid="1815335903940609729">"केवळ SIP कॉलसाठी"</string>
<string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"सर्व कॉलसाठी"</string>
diff --git a/sip/res/values-ms-rMY/strings.xml b/sip/res/values-ms-rMY/strings.xml
index f41589e..b42068b 100644
--- a/sip/res/values-ms-rMY/strings.xml
+++ b/sip/res/values-ms-rMY/strings.xml
@@ -19,7 +19,7 @@
<string name="sip_settings" msgid="3768482698061677257">"Tetapan SIP"</string>
<string name="sip_accounts" msgid="85559497282185405">"Akaun SIP"</string>
<string name="sip_accounts_title" msgid="2082527045326874519">"Akaun"</string>
- <string name="sip_receive_calls" msgid="426678617137462173">"Menerima panggilan masuk"</string>
+ <string name="sip_receive_calls" msgid="426678617137462173">"Terima panggilan masuk"</string>
<string name="sip_receive_calls_summary" msgid="946161517528227523">"Menggunakan lebih hayat bateri"</string>
<string name="sip_call_options_title" msgid="8421210494703869806">"Gunakan panggilan SIP"</string>
<string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Gunakan panggilan SIP (Wi-Fi sahaja)"</string>
diff --git a/sip/res/values-pl/strings.xml b/sip/res/values-pl/strings.xml
index d00c723..47aa286 100644
--- a/sip/res/values-pl/strings.xml
+++ b/sip/res/values-pl/strings.xml
@@ -20,11 +20,11 @@
<string name="sip_accounts" msgid="85559497282185405">"Konta SIP"</string>
<string name="sip_accounts_title" msgid="2082527045326874519">"Konta"</string>
<string name="sip_receive_calls" msgid="426678617137462173">"Odbieraj przychodzące"</string>
- <string name="sip_receive_calls_summary" msgid="946161517528227523">"Zużywa więcej energii baterii"</string>
+ <string name="sip_receive_calls_summary" msgid="946161517528227523">"Skraca czas pracy baterii"</string>
<string name="sip_call_options_title" msgid="8421210494703869806">"Użyj połączenia SIP"</string>
<string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Użyj połączenia SIP (tylko przez Wi-Fi)"</string>
<string name="sip_call_options_entry_1" msgid="7217659161237099900">"Przy wszystkich połączeniach, gdy sieć transmisji danych jest dostępna"</string>
- <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Tylko do połączeń SIP"</string>
+ <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Tylko połączenia SIP"</string>
<string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Wszystkie połączenia"</string>
<string name="add_sip_account" msgid="800843669753980091">"Dodaj konto"</string>
<string name="remove_sip_account" msgid="1367664438506503690">"Usuń konto"</string>
@@ -48,8 +48,8 @@
<string name="registration_status_invalid_credentials" msgid="8406872554323334182">"Rejestracja konta nie powiodła się: nieprawidłowa nazwa użytkownika lub hasło."</string>
<string name="registration_status_server_unreachable" msgid="7710275557045148634">"Rejestracja konta nie powiodła się: sprawdź nazwę serwera."</string>
<string name="third_party_account_summary" msgid="9041060473615403041">"To konto jest obecnie używane przez aplikację <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
- <string name="sip_edit_title" msgid="1967247832635750410">"Szczegóły konta SIP"</string>
- <string name="sip_edit_new_title" msgid="266414118302574305">"Szczegóły konta SIP"</string>
+ <string name="sip_edit_title" msgid="1967247832635750410">"Dane konta SIP"</string>
+ <string name="sip_edit_new_title" msgid="266414118302574305">"Dane konta SIP"</string>
<string name="domain_address_title" msgid="1968479941328225423">"Serwer"</string>
<string name="username_title" msgid="6770064611005663470">"Nazwa użytkownika"</string>
<string name="password_title" msgid="5289013731515564295">"Hasło"</string>
diff --git a/sip/res/values-tl/strings.xml b/sip/res/values-tl/strings.xml
index f6b608a..893421a 100644
--- a/sip/res/values-tl/strings.xml
+++ b/sip/res/values-tl/strings.xml
@@ -19,10 +19,10 @@
<string name="sip_settings" msgid="3768482698061677257">"Mga setting ng SIP"</string>
<string name="sip_accounts" msgid="85559497282185405">"Mga SIP account"</string>
<string name="sip_accounts_title" msgid="2082527045326874519">"Mga Account"</string>
- <string name="sip_receive_calls" msgid="426678617137462173">"Tumanggap ng mga papasok na tawag"</string>
+ <string name="sip_receive_calls" msgid="426678617137462173">"Tumanggap ng papasok na tawag"</string>
<string name="sip_receive_calls_summary" msgid="946161517528227523">"Gumagamit ng higit na baterya"</string>
- <string name="sip_call_options_title" msgid="8421210494703869806">"Gamitin ang pagtawag sa pamamagitan ng SIP"</string>
- <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Gamitin ang pagtawag sa pamamagitan ng SIP (Wi-Fi lang)"</string>
+ <string name="sip_call_options_title" msgid="8421210494703869806">"Gamitin ang SIP calling"</string>
+ <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Gamitin ang SIP calling (Wi-Fi lang)"</string>
<string name="sip_call_options_entry_1" msgid="7217659161237099900">"Para sa lahat ng mga tawag kapag available ang data network"</string>
<string name="sip_call_options_entry_2" msgid="1815335903940609729">"Para lang sa mga tawag sa pamamagitan ng SIP"</string>
<string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Para sa lahat ng tawag"</string>
@@ -48,8 +48,8 @@
<string name="registration_status_invalid_credentials" msgid="8406872554323334182">"Hindi matagumpay ang pagpaparehistro ng account: Maling username o password."</string>
<string name="registration_status_server_unreachable" msgid="7710275557045148634">"Nabigo ang pagpaparehistro ng account: Tingnan ang pangalan ng server."</string>
<string name="third_party_account_summary" msgid="9041060473615403041">"Kasalukuyang ginagamit ang account na ito ng app ng <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
- <string name="sip_edit_title" msgid="1967247832635750410">"Mga detalye ng SIP account"</string>
- <string name="sip_edit_new_title" msgid="266414118302574305">"Mga detalye ng SIP account"</string>
+ <string name="sip_edit_title" msgid="1967247832635750410">"Detalye ng SIP account"</string>
+ <string name="sip_edit_new_title" msgid="266414118302574305">"Detalye ng SIP account"</string>
<string name="domain_address_title" msgid="1968479941328225423">"Server"</string>
<string name="username_title" msgid="6770064611005663470">"Username"</string>
<string name="password_title" msgid="5289013731515564295">"Password"</string>
diff --git a/sip/res/values-zh-rCN/strings.xml b/sip/res/values-zh-rCN/strings.xml
index 2d073c1..db7c44f 100644
--- a/sip/res/values-zh-rCN/strings.xml
+++ b/sip/res/values-zh-rCN/strings.xml
@@ -48,8 +48,8 @@
<string name="registration_status_invalid_credentials" msgid="8406872554323334182">"帐户注册失败：用户名或密码有误。"</string>
<string name="registration_status_server_unreachable" msgid="7710275557045148634">"帐户注册失败：请检查服务器名称。"</string>
<string name="third_party_account_summary" msgid="9041060473615403041">"<xliff:g id="ACCOUNT_OWNER">%s</xliff:g>应用目前正在使用此帐户。"</string>
- <string name="sip_edit_title" msgid="1967247832635750410">"互联网电话帐户详情"</string>
- <string name="sip_edit_new_title" msgid="266414118302574305">"互联网电话帐户详情"</string>
+ <string name="sip_edit_title" msgid="1967247832635750410">"SIP 帐户详情"</string>
+ <string name="sip_edit_new_title" msgid="266414118302574305">"SIP 帐户详情"</string>
<string name="domain_address_title" msgid="1968479941328225423">"服务器"</string>
<string name="username_title" msgid="6770064611005663470">"用户名"</string>
<string name="password_title" msgid="5289013731515564295">"密码"</string>
diff --git a/src/com/android/phone/CarrierConfigLoader.java b/src/com/android/phone/CarrierConfigLoader.java
index e0834c7..2c2e095 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -17,6 +17,7 @@
package com.android.phone;
import static android.Manifest.permission.READ_PHONE_STATE;
+import static android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE;
import android.annotation.NonNull;
import android.app.ActivityManagerNative;
@@ -616,7 +617,12 @@
@Override public
@NonNull
PersistableBundle getConfigForSubId(int subId) {
- mContext.enforceCallingOrSelfPermission(READ_PHONE_STATE, null);
+ try {
+ mContext.enforceCallingOrSelfPermission(READ_PRIVILEGED_PHONE_STATE, null);
+ // SKIP checking run-time READ_PHONE_STATE since using PRIVILEGED
+ } catch (SecurityException e) {
+ mContext.enforceCallingOrSelfPermission(READ_PHONE_STATE, null);
+ }
int phoneId = SubscriptionManager.getPhoneId(subId);
PersistableBundle retConfig = CarrierConfigManager.getDefaultConfig();
if (SubscriptionManager.isValidPhoneId(phoneId)) {
diff --git a/src/com/android/phone/PhoneGlobals.java b/src/com/android/phone/PhoneGlobals.java
index 4fca2ea..1faf0ee 100644
--- a/src/com/android/phone/PhoneGlobals.java
+++ b/src/com/android/phone/PhoneGlobals.java
@@ -671,7 +671,7 @@
synchronized (this) {
if (mWakeState == WakeState.SLEEP) {
if (DBG) Log.d(LOG_TAG, "pulse screen lock");
- mPowerManager.wakeUp(SystemClock.uptimeMillis());
+ mPowerManager.wakeUp(SystemClock.uptimeMillis(), "android.phone:WAKE");
}
}
}
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index d9680cf..8273e1e 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -2713,10 +2713,10 @@
private boolean canReadPhoneState(String callingPackage, String message) {
try {
- mApp.enforceCallingOrSelfPermission(
+ mApp.enforceCallingPermission(
android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, message);
- // SKIP checking for run-time permission since self or obtained PRIVILEDGED
+ // SKIP checking for run-time permission since obtained PRIVILEDGED
return true;
} catch (SecurityException e) {
mApp.enforceCallingOrSelfPermission(android.Manifest.permission.READ_PHONE_STATE,
diff --git a/src/com/android/phone/settings/fdn/EditFdnContactScreen.java b/src/com/android/phone/settings/fdn/EditFdnContactScreen.java
index a047b0b..13f7d6b 100644
--- a/src/com/android/phone/settings/fdn/EditFdnContactScreen.java
+++ b/src/com/android/phone/settings/fdn/EditFdnContactScreen.java
@@ -31,6 +31,7 @@
import android.os.Handler;
import android.provider.Contacts.PeopleColumns;
import android.provider.Contacts.PhonesColumns;
+import android.provider.ContactsContract.CommonDataKinds;
import android.telephony.PhoneNumberUtils;
import android.text.Selection;
import android.text.Spannable;
@@ -50,7 +51,6 @@
import com.android.phone.PhoneGlobals;
import com.android.phone.R;
import com.android.phone.SubscriptionInfoHelper;
-import com.android.internal.telephony.Phone;
import com.android.internal.telephony.PhoneFactory;
/**
@@ -96,7 +96,7 @@
private static final Intent CONTACT_IMPORT_INTENT;
static {
CONTACT_IMPORT_INTENT = new Intent(Intent.ACTION_GET_CONTENT);
- CONTACT_IMPORT_INTENT.setType(android.provider.Contacts.Phones.CONTENT_ITEM_TYPE);
+ CONTACT_IMPORT_INTENT.setType(CommonDataKinds.Phone.CONTENT_ITEM_TYPE);
}
/** flag to track saving state */
private boolean mDataBusy;
diff --git a/src/com/android/services/telephony/TelephonyConnection.java b/src/com/android/services/telephony/TelephonyConnection.java
index 8c09a95..cbe7c0a 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -67,14 +67,21 @@
AsyncResult ar = (AsyncResult) msg.obj;
com.android.internal.telephony.Connection connection =
(com.android.internal.telephony.Connection) ar.result;
- if ((connection.getAddress() != null &&
- mOriginalConnection.getAddress() != null &&
+ if (mOriginalConnection != null) {
+ if (connection != null &&
+ ((connection.getAddress() != null &&
+ mOriginalConnection.getAddress() != null &&
mOriginalConnection.getAddress().contains(connection.getAddress())) ||
- connection.getStateBeforeHandover() == mOriginalConnection.getState()) {
- Log.d(TelephonyConnection.this, "SettingOriginalConnection " +
- mOriginalConnection.toString() + " with " + connection.toString());
- setOriginalConnection(connection);
- mWasImsConnection = false;
+ connection.getStateBeforeHandover() == mOriginalConnection.getState())) {
+ Log.d(TelephonyConnection.this,
+ "SettingOriginalConnection " + mOriginalConnection.toString()
+ + " with " + connection.toString());
+ setOriginalConnection(connection);
+ mWasImsConnection = false;
+ }
+ } else {
+ Log.w(TelephonyConnection.this,
+ "MSG_HANDOVER_STATE_CHANGED: mOriginalConnection==null - invalid state (not cleaned up)");
}
break;
case MSG_RINGBACK_TONE:
@@ -581,10 +588,14 @@
*/
void clearOriginalConnection() {
if (mOriginalConnection != null) {
- getPhone().unregisterForPreciseCallStateChanged(mHandler);
- getPhone().unregisterForRingbackTone(mHandler);
- getPhone().unregisterForHandoverStateChanged(mHandler);
- getPhone().unregisterForDisconnect(mHandler);
+ if (getPhone() != null) {
+ getPhone().unregisterForPreciseCallStateChanged(mHandler);
+ getPhone().unregisterForRingbackTone(mHandler);
+ getPhone().unregisterForHandoverStateChanged(mHandler);
+ getPhone().unregisterForDisconnect(mHandler);
+ }
+ mOriginalConnection.removePostDialListener(mPostDialListener);
+ mOriginalConnection.removeListener(mOriginalConnectionListener);
mOriginalConnection = null;
}
}
@@ -809,12 +820,7 @@
private void close() {
Log.v(this, "close");
- if (getPhone() != null) {
- getPhone().unregisterForPreciseCallStateChanged(mHandler);
- getPhone().unregisterForRingbackTone(mHandler);
- getPhone().unregisterForHandoverStateChanged(mHandler);
- }
- mOriginalConnection = null;
+ clearOriginalConnection();
destroy();
}