commit 9e2cbf3abe4e64a531c2590669a96627d71e132b
author c_nagarw <nagarw@codeaurora.org> Tue Jan 03 18:29:33 2017 +0530
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Feb 15 01:08:43 2017 -0800
tree 1f95193f50db7c69ac674182476bafefde05cf53
parent 8962c60cb86ac3c52f7775676c47b991cfb1a26a

Fix MT Call notification issue while restoring deafult APNs

MT Call notification was blocked on the DB request to get
the carrier name due to the resotre default APNs operation.
Fixed by using another api which avoids DB operation.

CRs-Fixed: 1104404
Change-Id: I9905b96c89608a95298c761c6966f6a2a7fabb47

InCallUI/src/com/android/incallui/StatusBarNotifier.java

diff --git a/InCallUI/src/com/android/incallui/StatusBarNotifier.java b/InCallUI/src/com/android/incallui/StatusBarNotifier.java
index 1efa3cc..1ff343c 100644
--- a/InCallUI/src/com/android/incallui/StatusBarNotifier.java
+++ b/InCallUI/src/com/android/incallui/StatusBarNotifier.java
@@ -41,6 +41,7 @@
 import android.os.SystemClock;
 import android.telecom.Call.Details;
 import android.telecom.PhoneAccount;
+import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
 import android.telecom.VideoProfile;
 import android.telephony.TelephonyManager;
@@ -50,6 +51,7 @@
 import android.text.TextDirectionHeuristics;
 import android.text.TextUtils;
 
+import com.android.contacts.common.compat.telecom.TelecomManagerCompat;
 import com.android.contacts.common.ContactsUtils;
 import com.android.contacts.common.ContactsUtils.UserType;
 import com.android.contacts.common.GeoUtil;
@@ -360,10 +362,17 @@
         //set the content
         boolean isMultiSimDevice = mTelephonyManager.isMultiSimEnabled();
         if (isMultiSimDevice) {
-            SubscriptionInfo info =
-                    SubscriptionManager.from(mContext).getActiveSubscriptionInfo(call.getSubId());
-            if (info != null) {
-                content += " (" + info.getDisplayName() + ")";
+            PhoneAccountHandle ph = call.getAccountHandle();
+            String accountLabel = null;
+            if (ph != null) {
+                PhoneAccount account = TelecomManagerCompat.getPhoneAccount(
+                        InCallPresenter.getInstance().getTelecomManager(), ph);
+                if (account != null && !TextUtils.isEmpty(account.getLabel())) {
+                    accountLabel = account.getLabel().toString();
+                }
+            }
+            if (!TextUtils.isEmpty(accountLabel)) {
+                content += " (" + accountLabel + ")";
             }
         }