commit 50e6c8bc37845032f9a14b00fd978f1e7dd7c7e8
author Chen Xu <fionaxu@google.com> Fri Sep 20 17:47:10 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Sep 20 17:47:10 2019 -0700
tree b7645e501ff0382c7953aff94642311c8e356366
parent 2134d9b15f822556f21de3cfb2176cf3f6e6990f
parent 33a1dfcde44f90814e5f40b54ff2660f1d11de8e

Merge "display the phone number from the correct subId" into qt-qpr1-dev
am: 33a1dfcde4

Change-Id: Ibdda031579904d7ccbf2e14c6120e3f5beae0970

src/com/android/phone/NotificationMgr.java

diff --git a/src/com/android/phone/NotificationMgr.java b/src/com/android/phone/NotificationMgr.java
index 9e80f96..3443115 100644
--- a/src/com/android/phone/NotificationMgr.java
+++ b/src/com/android/phone/NotificationMgr.java
@@ -663,8 +663,16 @@
         // Navigate to "Network Selection Settings" which list all subscriptions.
         PendingIntent contentIntent = PendingIntent.getActivity(mContext, 0,
                 new Intent(ACTION_MOBILE_NETWORK_LIST), 0);
-        String line1Num = mTelephonyManager.getLine1Number(subId);
-
+        // Display phone number from the other sub
+        String line1Num = null;
+        SubscriptionManager subMgr = (SubscriptionManager) mContext.getSystemService(
+            Context.TELEPHONY_SUBSCRIPTION_SERVICE);
+        List<SubscriptionInfo> subList = subMgr.getActiveSubscriptionInfoList(false);
+        for (SubscriptionInfo sub : subList) {
+            if (sub.getSubscriptionId() != subId) {
+                line1Num = mTelephonyManager.getLine1Number(sub.getSubscriptionId());
+            }
+        }
         final CharSequence contentText = TextUtils.isEmpty(line1Num) ?
             String.format(mContext.getText(
                 R.string.limited_sim_function_notification_message).toString(), carrierName) :