commit c21617d29449601363270b8e745e65e85469a093
author Tyler Gunn <tgunn@google.com> Fri Nov 11 18:01:20 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Nov 11 18:01:27 2016 +0000
tree a2d6060900cd71142c0d89f0191db3e9f7e7a8c9
parent 81c27846672b3fcfaa1b3732d9655bb9073e4b01
parent cbd6850ae398e8f96fab3fdd6be1832cba98306b

Merge "Set CAPABILITY_SUPPORTS_VIDEO_CALLING on PhoneAccount."

res/values-hi/strings.xml

diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 4017109..02f38a4 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -425,7 +425,7 @@
     <string name="pin2_error_exception" msgid="1088689322248996699">"नेटवर्क या SIM कार्ड त्रुटि"</string>
     <string name="doneButton" msgid="2859593360997984240">"पूर्ण"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"ध्‍वनिमेल नबंर"</string>
-    <string name="card_title_dialing" msgid="5769417478498348054">"डायल कर रहा है"</string>
+    <string name="card_title_dialing" msgid="5769417478498348054">"डायल हो रहा है"</string>
     <string name="card_title_redialing" msgid="8253487008234167266">"पुन: डायल हो रहा है"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"कॉन्फ़्रेंस कॉल"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"इनकमिंग कॉल"</string>

src/com/android/phone/NetworkSetting.java

diff --git a/src/com/android/phone/NetworkSetting.java b/src/com/android/phone/NetworkSetting.java
index a09c5c5..29608da 100644
--- a/src/com/android/phone/NetworkSetting.java
+++ b/src/com/android/phone/NetworkSetting.java
@@ -161,8 +161,6 @@
         public void onServiceConnected(ComponentName className, IBinder service) {
             if (DBG) log("connection created, binding local service.");
             mNetworkQueryService = ((NetworkQueryService.LocalBinder) service).getService();
-            // as soon as it is bound, run a query.
-            loadNetworksList();
         }
 
         /** Handle the task of cleaning up the local binding */

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 1f15cc7..ac4510a 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -1486,9 +1486,8 @@
         return handlePinMmiForSubscriber(getDefaultSubscription(), dialString);
     }
 
-    public void handleUssdRequest(String ussdRequest, ResultReceiver wrappedCallback) {
+    public void handleUssdRequest(int subId, String ussdRequest, ResultReceiver wrappedCallback) {
       enforceCallPermission();
-      int subId = getDefaultSubscription();
       if (!SubscriptionManager.isValidSubscriptionId(subId)) {
           return;
       }

src/com/android/services/telephony/TelephonyConnection.java

diff --git a/src/com/android/services/telephony/TelephonyConnection.java b/src/com/android/services/telephony/TelephonyConnection.java
index 4199d5d..30aca49 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -825,6 +825,7 @@
         setVideoState(mOriginalConnection.getVideoState());
         setOriginalConnectionCapabilities(mOriginalConnection.getConnectionCapabilities());
         setWifi(mOriginalConnection.isWifi());
+        setAudioModeIsVoip(mOriginalConnection.getAudioModeIsVoip());
         setVideoProvider(mOriginalConnection.getVideoProvider());
         setAudioQuality(mOriginalConnection.getAudioQuality());
         setTechnologyTypeExtra();