commit 68e14d06382a1c15c6f238a90db94e06df21c263
author Nancy Chen <nancychen@google.com> Sat Jul 19 00:32:40 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 17 17:59:02 2014 +0000
tree 940753c8b1c8a081dc8872b6cced6763f154c01d
parent 3aa862e2331a9733d5cbca24354e42463b3f63d8
parent 323f3219a92b7d40f53a40d2e36f96d488b3476f

Merge "Change the action bar menu item color in sip account settings" into lmp-dev

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 90f2f35..8e25be9 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -1742,4 +1742,10 @@
         }
         return adnRecord.getAlphaTag();
     }
+
+    @Override
+    public boolean setOperatorBrandOverride(String iccId, String brand) {
+        enforceModifyPermissionOrCarrierPrivilege();
+        return mPhone.setOperatorBrandOverride(iccId, brand);
+    }
 }

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 3bf51d5..4168366 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -479,7 +479,7 @@
      * @return The capabilities with video capabilities applied.
      */
     private int applyVideoCapabilities(int capabilities) {
-        int currentCapabilities = getCallCapabilities();
+        int currentCapabilities = capabilities;
         if (mRemoteVideoCapable) {
             currentCapabilities |= CallCapabilities.SUPPORTS_VT_REMOTE;
         } else {

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

diff --git a/src/com/android/services/telephony/TelephonyConnectionService.java b/src/com/android/services/telephony/TelephonyConnectionService.java
index 04b016b..bf2e3a0 100644
--- a/src/com/android/services/telephony/TelephonyConnectionService.java
+++ b/src/com/android/services/telephony/TelephonyConnectionService.java
@@ -177,12 +177,17 @@
                 request.getExtras(),
                 request.getVideoState());
 
+        TelephonyConnection connection = null;
         if (phone.getPhoneType() == TelephonyManager.PHONE_TYPE_GSM) {
-            response.onSuccess(telephonyRequest, new GsmConnection(originalConnection));
+            connection = new GsmConnection(originalConnection);
         } else if (phone.getPhoneType() == TelephonyManager.PHONE_TYPE_CDMA) {
-            response.onSuccess(telephonyRequest, new CdmaConnection(originalConnection));
-        } else {
+            connection = new CdmaConnection(originalConnection);
+        }
+
+        if (connection == null) {
             response.onCancel(request);
+        } else {
+            response.onSuccess(telephonyRequest, connection);
         }
     }