commit 35c8a9a6ad6aac2fb74215c863a15335faea3594
author Mallikarjuna GB <gbmalli@codeaurora.org> Tue Jun 23 12:09:41 2015 +0530
committer Linux Build Service Account <lnxbuild@localhost> Tue Oct 06 03:30:16 2015 -0600
tree 4d765c82d5c595d951a56c13b58e4fd8e26ef5a0
parent cef5411581b3b298f00a32a1f03e3b5761295a27

Fix to display the proper operator name on carkit.

Currently the operator name returned in BluetoothPhoneService
is incorrect with the existing API used. Get the network operator
name correctly in BluetoothPhoneService using telephony manager API.

Change-Id: Icc26f61802f36de5b35c30fab3b3982478110fc0

src/com/android/server/telecom/BluetoothPhoneServiceImpl.java

diff --git a/src/com/android/server/telecom/BluetoothPhoneServiceImpl.java b/src/com/android/server/telecom/BluetoothPhoneServiceImpl.java
index 9deffbe..d32da84 100644
--- a/src/com/android/server/telecom/BluetoothPhoneServiceImpl.java
+++ b/src/com/android/server/telecom/BluetoothPhoneServiceImpl.java
@@ -30,12 +30,15 @@
 import android.os.RemoteException;
 import android.telecom.Connection;
 import android.telecom.PhoneAccount;
+import android.telecom.PhoneAccountHandle;
 import android.telephony.PhoneNumberUtils;
+import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 
 import com.android.server.telecom.CallsManager.CallsManagerListener;
 
+import java.lang.NumberFormatException;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
@@ -152,14 +155,30 @@
                 long token = Binder.clearCallingIdentity();
                 try {
                     Log.i(TAG, "getNetworkOperator");
+                    String label = null;
                     PhoneAccount account = getBestPhoneAccount();
                     if (account != null) {
-                        return account.getLabel().toString();
+                        PhoneAccountHandle ph = account.getAccountHandle();
+                        if (ph != null) {
+                            String subId = ph.getId();
+                            int sub;
+                            try {
+                                sub = Integer.parseInt(subId);
+                            } catch (NumberFormatException e){
+                                Log.w(this, " NumberFormatException " + e);
+                                sub = SubscriptionManager.getDefaultVoiceSubId();
+                            }
+                            label = TelephonyManager.from(mContext)
+                                    .getNetworkOperatorName(sub);
+                        } else {
+                            Log.w(this, "Phone Account Handle is NULL");
+                        }
                     } else {
                         // Finally, just get the network name from telephony.
-                        return TelephonyManager.from(mContext)
+                        label = TelephonyManager.from(mContext)
                                 .getNetworkOperatorName();
                     }
+                    return label;
                 } finally {
                     Binder.restoreCallingIdentity(token);
                 }