Merge "Updating CallLogAsync.addCalls method call to prevent errors"
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 8489e27..d1af418 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -429,7 +429,7 @@
<string name="incall_call_type_label_sip" msgid="2310958283037924371">"Internetopkald"</string>
<string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Nødopkald"</string>
<string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Tænder for radio ..."</string>
- <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Området er ude af drift. Prøver igen ..."</string>
+ <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Uden for dækning. Prøver igen ..."</string>
<string name="dial_emergency_error" msgid="7969515493359619960">"Opkaldet blev ikke sendt. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> er ikke et nødnummer."</string>
<string name="dial_emergency_empty_error" msgid="5556166819619323893">"Opkaldet blev ikke sendt. Indtast et nødnummer."</string>
<string name="dialerKeyboardHintText" msgid="9192914825413747792">"Brug tastatur til at ringe op"</string>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 4a349e8..29bc173 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -28,10 +28,10 @@
<string name="mmiStarted" msgid="6347869857061147003">"បានចាប់ផ្ដើមកូដ MMI"</string>
<string name="ussdRunning" msgid="485588686340541690">"កូដ USSD កំពុងដំណើរការ…"</string>
<string name="mmiCancelled" msgid="2771923949751842276">"បានបោះបង់កូដ MMI"</string>
- <string name="cancel" msgid="5044513931633602634">"បោះបង់"</string>
+ <string name="cancel" msgid="5044513931633602634">"បោះបង់"</string>
<string name="enter_input" msgid="1810529547726803893">"សារ USSD ត្រូវតែមានតួអក្សរចន្លោះ <xliff:g id="MIN_LEN">%d</xliff:g> និង <xliff:g id="MAX_LEN">%d</xliff:g> ។ សូមព្យាយាមម្ដងទៀត។"</string>
<string name="manageConferenceLabel" msgid="4691922394301969053">"គ្រប់គ្រងការហៅជាសន្និសីទ"</string>
- <string name="ok" msgid="3811371167865772377">"យល់ព្រម"</string>
+ <string name="ok" msgid="3811371167865772377">"យល់ព្រម"</string>
<string name="audio_mode_speaker" msgid="27649582100085266">"អូប៉ាល័រ"</string>
<string name="audio_mode_earpiece" msgid="4156527186373869107">"កាស"</string>
<string name="audio_mode_wired_headset" msgid="1465350758489175975">"កាសមានខ្សែ"</string>
@@ -108,7 +108,7 @@
<string name="exception_error" msgid="7027667130619518211">"កំហុសស៊ីមកាត ឬបណ្ដាញ។"</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="close_dialog" msgid="2365884406356986917">"យល់ព្រម"</string>
<string name="enable" msgid="1059008390636773574">"បើក"</string>
<string name="disable" msgid="7274240979164762320">"បិទ"</string>
<string name="change_num" msgid="239476305819844391">"ធ្វើបច្ចុប្បន្នភាព"</string>
@@ -169,7 +169,7 @@
<item msgid="5958053792390386668">"GSM/WCDMA ស្វ័យប្រវត្តិ"</item>
<item msgid="7913148405605373434">"តែ WCDMA ប៉ុណ្ណោះ"</item>
<item msgid="1524224863879435516">"តែ GSM ប៉ុណ្ណោះ"</item>
- <item msgid="3817924849415716259">"GSM/WCDMA ដែលចូលចិត្ត"</item>
+ <item msgid="3817924849415716259">"GSM/WCDMA ដែលចូលចិត្ត"</item>
</string-array>
<string name="data_enabled" msgid="5972538663568715366">"បានបើកទិន្នន័យ"</string>
<string name="data_enable_summary" msgid="5022018967714633874">"បើកចូលដំណើរការទិន្នន័យលើបណ្ដាញឧបករណ៍ចល័ត"</string>
@@ -181,7 +181,7 @@
<string name="gsm_umts_options" msgid="6538311689850981686">"ជម្រើស GSM/UMTS"</string>
<string name="cdma_options" msgid="4016822858172249884">"ជម្រើស CDMA"</string>
<string name="throttle_data_usage" msgid="3715677828160555808">"ការប្រើប្រាស់ទិន្នន័យ"</string>
- <string name="throttle_current_usage" msgid="8762280193043815361">"បច្ចុប្បន្នបានប្រើទិន្នន័យ"</string>
+ <string name="throttle_current_usage" msgid="8762280193043815361">"បច្ចុប្បន្នបានប្រើទិន្នន័យ"</string>
<string name="throttle_time_frame" msgid="1915198770363734685">"ទិន្នន័យប្រើរយៈពេល"</string>
<string name="throttle_rate" msgid="4710388992676803508">"គោលនយោបាយអត្រាទិន្នន័យ"</string>
<string name="throttle_help" msgid="243651091785169900">"ស្វែងយល់បន្ថែម"</string>
@@ -213,7 +213,7 @@
<string name="local_enable" msgid="6370463247609136359">"បានបើកព័ត៌មានក្នុងស្រុក"</string>
<string name="local_disable" msgid="4405691986943795798">"បានបិទព័ត៌មានក្នុងស្រុក"</string>
<string name="enable_disable_regional" msgid="4905652414535565872">"នៃតំបន់"</string>
- <string name="regional_enable" msgid="4434680415437834759">"បានបើកព័ត៌មានក្នុងតំបន់"</string>
+ <string name="regional_enable" msgid="4434680415437834759">"បានបើកព័ត៌មានក្នុងតំបន់"</string>
<string name="regional_disable" msgid="5359325527213850077">"បានបិទព័ត៌មានក្នុងតំបន់"</string>
<string name="enable_disable_national" msgid="236278090206880734">"ជាតិ"</string>
<string name="national_enable" msgid="1172443648912246952">"បានបើកព័ត៌មានជាតិ"</string>
@@ -249,11 +249,11 @@
<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>
+ <string name="lafs_enable" msgid="2791978667205137052">"បានបើកកាលវិភាគហោះហើរអាកាសយានដ្ឋានក្នុងស្រុក"</string>
+ <string name="lafs_disable" msgid="2391212397725495350">"បានបិទកាលវិភាគហោះហើរអាកាសយានដ្ឋានក្នុងស្រុក"</string>
<string name="enable_disable_restaurants" msgid="6240381945336814024">"ភោជនីយដ្ឋាន"</string>
<string name="restaurants_enable" msgid="5137657479469118847">"បានបើកភោជនីយដ្ឋាន"</string>
- <string name="restaurants_disable" msgid="3678480270938424092">"បានបិទភោជនីយដ្ឋាន"</string>
+ <string name="restaurants_disable" msgid="3678480270938424092">"បានបិទភោជនីយដ្ឋាន"</string>
<string name="enable_disable_lodgings" msgid="1822029172658551202">"បណ្ដោះអាសន្ន"</string>
<string name="lodgings_enable" msgid="3230042508992850322">"បានបើកជាបណ្ដោះអាសន្ន"</string>
<string name="lodgings_disable" msgid="3387879742320682391">"បានបិទជាបណ្ដោះអាសន្ន"</string>
@@ -267,7 +267,7 @@
<string name="stock_quotes_enable" msgid="4384802470887170543">"បានបើកសម្រង់ស្ដុក"</string>
<string name="stock_quotes_disable" msgid="4781450084565594998">"បានបិទសម្រង់ស្ដុក"</string>
<string name="enable_disable_eo" msgid="4863043263443942494">"ឱកាសការងារ"</string>
- <string name="eo_enable" msgid="8623559062015685813">"បានបើកឱកាសការងារ"</string>
+ <string name="eo_enable" msgid="8623559062015685813">"បានបើកឱកាសការងារ"</string>
<string name="eo_disable" msgid="3863812478090907609">"បានបិទឱកាសការងារ"</string>
<string name="enable_disable_mhh" msgid="908214593528968522">"វេជ្ជសាស្ត្រ សុខភាព និងមន្ទីរពេទ្យ"</string>
<string name="mhh_enable" msgid="5544500632306446815">"បានបើក វេជ្ជសាស្ត្រ សុខភាព និងមន្ទីរពេទ្យ"</string>
@@ -464,7 +464,7 @@
<string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"រំលងការធ្វើឲ្យសកម្ម?"</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_activate" msgid="1368528132525626264">"ធ្វើឲ្យសកម្ម"</string>
<string name="ota_title_activate_success" msgid="6570240212263372046">"បានធ្វើឲ្យទូរស័ព្ទសកម្ម។"</string>
<string name="ota_title_problem_with_activation" msgid="7095824491970084367">"មានបញ្ហាជាមួយនឹងការធ្វើឲ្យសកម្ម"</string>
<string name="ota_listen" msgid="162923839877584937">"អនុវត្តតាមសេចក្ដីណែនាំដែលបាននិយាយរហូតដល់លោកអ្នកស្ដាប់ឮហើយធ្វើឲ្យសកម្មពេញលេញ។"</string>
@@ -476,7 +476,7 @@
<string name="ota_spc_failure" msgid="3909983542575030796">"ការបរាជ័យ SPC លើស"</string>
<string name="ota_call_end" msgid="4537279738134612388">"ថយក្រោយ"</string>
<string name="ota_try_again" msgid="7685477206465902290">"ព្យាយាមម្ដងទៀត"</string>
- <string name="ota_next" msgid="3904945374358235910">"បន្ទាប់"</string>
+ <string name="ota_next" msgid="3904945374358235910">"បន្ទាប់"</string>
<string name="ecm_exit_dialog" msgid="4448531867763097533">"EcmExitDialog"</string>
<string name="phone_entered_ecm_text" msgid="6266424252578731203">"បានបញ្ចូលរបៀបការហៅទៅវិញពេលមានអាសន្ន"</string>
<string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"របៀបហៅទៅវិញពេលមានអាសន្ន"</string>
@@ -486,7 +486,7 @@
<item quantity="other" msgid="3122217344579273583">"ការតភ្ជាប់គ្មានទិន្នន័យសម្រាប់ <xliff:g id="COUNT">%s</xliff:g> នាទី"</item>
</plurals>
<plurals name="alert_dialog_exit_ecm">
- <item quantity="one" msgid="8060210887681426682">"ទូរស័ព្ទនឹងនៅក្នុងរបៀបហៅទៅវិញសម្រាប់តម្រូវការបន្ទាន់ <xliff:g id="COUNT">%s</xliff:g> នាទី។ ខណៈពេលដែលនៅក្នុងរបៀបនេះគ្មានកម្មវិធីដែលប្រើការតភ្ជាប់ទិន្នន័យឡើយ។ តើអ្នកចង់ចាកចេញឥឡូវនេះឬ?"</item>
+ <item quantity="one" msgid="8060210887681426682">"ទូរស័ព្ទនឹងនៅក្នុងរបៀបហៅទៅវិញសម្រាប់តម្រូវការបន្ទាន់ <xliff:g id="COUNT">%s</xliff:g> នាទី។ ខណៈពេលដែលនៅក្នុងរបៀបនេះគ្មានកម្មវិធីដែលប្រើការតភ្ជាប់ទិន្នន័យឡើយ។ តើអ្នកចង់ចាកចេញឥឡូវនេះឬ?"</item>
<item quantity="other" msgid="8617116564023933114">"ទូរស័ព្ទនឹងនៅក្នុងរបៀបហៅទៅវិញសម្រាប់ពេលមានអាសន្ន <xliff:g id="COUNT">%s</xliff:g> នាទី។ ខណៈពេលដែលនៅក្នុងរបៀបនេះគ្មានកម្មវិធីដែលបានប្រើការតភ្ជាប់ទិន្នន័យឡើយ។ តើអ្នកចង់ចាកចេញឥឡូវនេះឬ?"</item>
</plurals>
<plurals name="alert_dialog_not_avaialble_in_ecm">
@@ -534,8 +534,8 @@
<string name="sip_menu_save" msgid="5842531129356014943">"រក្សាទុក"</string>
<string name="sip_menu_discard" msgid="524075892158789701">"បោះបង់"</string>
<string name="alert_dialog_close" msgid="7759635137627626235">"បិទជីវប្រវត្តិ"</string>
- <string name="alert_dialog_ok" msgid="3580379406983564080">"យល់ព្រម"</string>
- <string name="close_profile" msgid="6886968271423155284">"បិទ"</string>
+ <string name="alert_dialog_ok" msgid="3580379406983564080">"យល់ព្រម"</string>
+ <string name="close_profile" msgid="6886968271423155284">"បិទ"</string>
<string name="primary_account_summary_with" msgid="1633960536212343187">"គណនីចម្បង។ <xliff:g id="REGISTRATION_STATUS">%s</xliff:g>"</string>
<string name="registration_status_checking_status" msgid="3381868307694056727">"កំពុងពិនិត្យមើលស្ថានភាព ..."</string>
<string name="registration_status_registering" msgid="4288401139400232968">"កំពុងចុះឈ្មោះ…"</string>
@@ -552,8 +552,8 @@
<string name="sip_edit_title" msgid="489288416435014385">"សេចក្ដីលម្អិតគណនី SIP"</string>
<string name="sip_edit_new_title" msgid="3659149255856520385">"សេចក្ដីលម្អិតគណនី SIP"</string>
<string name="domain_address_title" msgid="9071787581316160480">"ម៉ាស៊ីនមេ"</string>
- <string name="username_title" msgid="2479375923477682328">"ឈ្មោះអ្នកប្រើ"</string>
- <string name="password_title" msgid="3323555249068171531">"ពាក្យសម្ងាត់"</string>
+ <string name="username_title" msgid="2479375923477682328">"ឈ្មោះអ្នកប្រើ"</string>
+ <string name="password_title" msgid="3323555249068171531">"ពាក្យសម្ងាត់"</string>
<string name="display_name_title" msgid="2459768196312249937">"បង្ហាញឈ្មោះ"</string>
<string name="proxy_address_title" msgid="4828301345351614273">"អាសយដ្ឋានប្រូកស៊ីចេញ"</string>
<string name="port_title" msgid="5952939408078626657">"លេខច្រក"</string>
@@ -571,8 +571,8 @@
<string name="advanced_settings_hide" msgid="217398292824758079">"ប៉ះ ▽ ដើម្បីលាក់ទាំងអស់"</string>
<string name="empty_alert" msgid="6839103946505432390">"មិនអាចទុកឲ្យនៅទទេ និងបានទាមទារ <xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> ។"</string>
<string name="not_a_valid_port" msgid="4796149266434630292">"លេខច្រកគួរតែនៅចន្លោះ ១០០០ និង ៦៥៥៣៤។"</string>
- <string name="no_internet_available_title" msgid="3327109242858406165">"គ្មានការតភ្ជាប់អ៊ីនធឺណិត"</string>
- <string name="no_wifi_available_title" msgid="747881033089378758">"គ្មានការតភ្ជាប់តាមវ៉ាយហ្វាយ"</string>
+ <string name="no_internet_available_title" msgid="3327109242858406165">"គ្មានការតភ្ជាប់អ៊ីនធឺណិត"</string>
+ <string name="no_wifi_available_title" msgid="747881033089378758">"គ្មានការតភ្ជាប់តាមវ៉ាយហ្វាយ"</string>
<string name="no_internet_available" msgid="7877142631803238549">"ដើម្បីកំណត់ការហៅតាមអ៊ីនធឺណិត ពិនិត្យមើលការតភ្ជាប់អ៊ីនធឺណិតរបស់អ្នកដំបូង។"</string>
<string name="no_wifi_available" msgid="1225073547318465713">"អ្នកត្រូវតភ្ជាប់តាមបណ្ដាញវ៉ាយហ្វាយសម្រាប់ហៅតាមអ៊ីនធឺណិត (ប្រើការកំណត់បណ្ដាញឥតខ្សែ & )។"</string>
<string name="no_voip" msgid="8901474054537199865">"មិនបានគាំទ្រការហៅតាមអ៊ីនធឺណិត"</string>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 6f25a51..6b172c6 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -609,7 +609,7 @@
<string name="preference_category_ringtone" msgid="5197960752529332721">"ຣິງໂທນ & ການສັ່ນເຕືອນ"</string>
<string name="choose_wifi_for_call_msg" msgid="193549297122949976">"ໃຊ້ Wi-Fi ເພື່ອໂທບໍ?"</string>
<string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"ແມ່ນແລ້ວ"</string>
- <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"ບໍ່"</string>
+ <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"ບໍ່"</string>
<string name="gsm_connection_service_label" msgid="2332284528867411683">"GSM SIM ກາດທີ່ມາກັບເຄື່ອງ"</string>
<string name="cdma_connection_service_label" msgid="5038725238949035222">"CDMA SIM ກາດທີ່ມາກັບເຄື່ອງ"</string>
<string name="sip_connection_service_label" msgid="3547998349299125294">"ການໂທຜ່ານອິນເຕີເນັດທີ່ມາກັບເຄື່ອງ"</string>
diff --git a/src/com/android/services/telephony/GsmConnection.java b/src/com/android/services/telephony/GsmConnection.java
index d37accd..34ef27e 100644
--- a/src/com/android/services/telephony/GsmConnection.java
+++ b/src/com/android/services/telephony/GsmConnection.java
@@ -53,10 +53,4 @@
Log.e(this, e, "Failed to conference call.");
}
}
-
- @Override
- public void setIsConferenceCapable(boolean isConferenceCapable) {
- // This method increases access modifier.
- super.setIsConferenceCapable(isConferenceCapable);
- }
}
diff --git a/src/com/android/services/telephony/PstnConnectionService.java b/src/com/android/services/telephony/PstnConnectionService.java
index a654c69..00ed255 100644
--- a/src/com/android/services/telephony/PstnConnectionService.java
+++ b/src/com/android/services/telephony/PstnConnectionService.java
@@ -54,7 +54,7 @@
@Override
public void onCreateConnections(
final ConnectionRequest request,
- final Response<ConnectionRequest, Connection> response) {
+ final OutgoingCallResponse<Connection> response) {
if (!canCall(request.getHandle())) {
Log.d(this, "Cannot place the call with %s", this.getClass().getSimpleName());
diff --git a/src/com/android/services/telephony/SipConnectionService.java b/src/com/android/services/telephony/SipConnectionService.java
index 3faf787..465dba1 100644
--- a/src/com/android/services/telephony/SipConnectionService.java
+++ b/src/com/android/services/telephony/SipConnectionService.java
@@ -48,7 +48,7 @@
@Override
public void onCreateConnections(
ConnectionRequest request,
- Response<ConnectionRequest, Connection> callback) {
+ OutgoingCallResponse callback) {
new GetSipProfileTask(this, request, callback).execute();
super.onCreateConnections(request, callback);
}
@@ -114,14 +114,14 @@
*/
private class GetSipProfileTask extends AsyncTask<Void, Void, SipProfile> {
private final ConnectionRequest mRequest;
- private final Response<ConnectionRequest, Connection> mResponse;
+ private final OutgoingCallResponse mResponse;
private final SipProfileDb mSipProfileDb;
private final SipSharedPreferences mSipSharedPreferences;
GetSipProfileTask(
Context context,
ConnectionRequest request,
- Response<ConnectionRequest, Connection> response) {
+ OutgoingCallResponse response) {
mRequest = request;
mResponse = response;
mSipProfileDb = new SipProfileDb(context);
@@ -149,7 +149,7 @@
private void onSipProfileChosen(
SipProfile profile,
ConnectionRequest request,
- Response<ConnectionRequest, Connection> response) {
+ OutgoingCallResponse response) {
SipPhone phone = null;
if (profile != null) {
String sipUri = profile.getUriString();
diff --git a/src/com/android/services/telephony/TelephonyCallVideoProvider.java b/src/com/android/services/telephony/TelephonyCallVideoProvider.java
new file mode 100644
index 0000000..6e0fafd
--- /dev/null
+++ b/src/com/android/services/telephony/TelephonyCallVideoProvider.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2014 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
+ */
+
+package com.android.services.telephony;
+
+import android.telecomm.CallVideoProvider;
+
+
+/**
+ * Implements the CallVideoProvider.
+ */
+public class TelephonyCallVideoProvider extends CallVideoProvider {
+
+ @Override
+ public void setCamera(String cameraId) {
+ // Stub, to be implemented.
+ }
+}
diff --git a/src/com/android/services/telephony/TelephonyConnection.java b/src/com/android/services/telephony/TelephonyConnection.java
index 43e72c8..f379347 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -124,7 +124,7 @@
}
@Override
- protected void onSetAudioState(CallAudioState audioState) {
+ public void onSetAudioState(CallAudioState audioState) {
// TODO: update TTY mode.
if (mOriginalConnection != null) {
Call call = mOriginalConnection.getCall();
diff --git a/src/com/android/services/telephony/TelephonyConnectionService.java b/src/com/android/services/telephony/TelephonyConnectionService.java
index db4720b..a009bc8 100644
--- a/src/com/android/services/telephony/TelephonyConnectionService.java
+++ b/src/com/android/services/telephony/TelephonyConnectionService.java
@@ -51,7 +51,7 @@
protected void startCallWithPhone(
Phone phone,
ConnectionRequest request,
- Response<ConnectionRequest, Connection> response) {
+ OutgoingCallResponse<Connection> response) {
Log.d(this, "startCallWithPhone: %s.", request);
if (phone == null) {
@@ -135,7 +135,7 @@
private boolean checkServiceStateForOutgoingCall(
Phone phone,
ConnectionRequest request,
- Response<ConnectionRequest, Connection> response) {
+ OutgoingCallResponse<Connection> response) {
int state = phone.getServiceState().getState();
switch (state) {
case ServiceState.STATE_IN_SERVICE:
@@ -184,19 +184,28 @@
}
protected void respondWithResult(
- Uri request,
- Response<Uri, Subscription> response,
- Subscription result) {
+ ConnectionRequest request,
+ Response<ConnectionRequest, Connection> response,
+ Connection result) {
Log.d(this, "respondWithResult %s -> %s", request, result);
response.onResult(request, result);
}
protected void respondWithResult(
ConnectionRequest request,
- Response<ConnectionRequest, Connection> response,
+ OutgoingCallResponse<Connection> response,
Connection result) {
Log.d(this, "respondWithResult %s -> %s", request, result);
- response.onResult(request, result);
+ response.onSuccess(request, result);
+ }
+
+ protected void respondWithError(
+ ConnectionRequest request,
+ OutgoingCallResponse<Connection> response,
+ int errorCode,
+ String errorMsg) {
+ Log.d(this, "respondWithError %s: %d %s", request, errorCode, errorMsg);
+ response.onFailure(request, errorCode, errorMsg);
}
protected final TelephonyConnection createTelephonyConnection(
diff --git a/tests/src/com/android/phone/unit/CnapTest.java b/tests/src/com/android/phone/CnapTest.java
similarity index 100%
rename from tests/src/com/android/phone/unit/CnapTest.java
rename to tests/src/com/android/phone/CnapTest.java