commit 11e5deec3ddbf5191d2a488bc86abff5841e700c
author Qiongcheng Luo <qiongcheng.luo@sonymobile.com> Mon Aug 12 14:30:41 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Aug 12 14:30:41 2019 -0700
tree caef94a44d1722ee251ee8d8584dd669e776f48d
parent 6e4c75816570e09c33ae726a2438f0c5c4b96fcf
parent e60e2fdf07fbc49aa473c7bc82912d65b2a58abb

[automerger skipped] SubId is not included in extra for carrier config change intent for SIM2 am: a0f6e90c0f -s ours
am: e60e2fdf07 -s ours
am skip reason: change_id I97c734a38dc8b37cc4996862d696351063fafd58 with SHA1 e7de61b459 is in history

Change-Id: Ib688ec22f7101b45fb3d4caabbcb67837285583a

src/com/android/phone/NotificationMgr.java

diff --git a/src/com/android/phone/NotificationMgr.java b/src/com/android/phone/NotificationMgr.java
index f0473c9..228fcea 100644
--- a/src/com/android/phone/NotificationMgr.java
+++ b/src/com/android/phone/NotificationMgr.java
@@ -684,7 +684,7 @@
         final Notification notification = new Notification.BigTextStyle(builder).bigText(
                 contentText).build();
 
-        mNotificationManager.notifyAsUser(Integer.toString(subId),
+        notifyAsUser(Integer.toString(subId),
                 LIMITED_SIM_FUNCTION_NOTIFICATION,
                 notification, UserHandle.ALL);
         mLimitedSimFunctionNotify.add(subId);
@@ -698,12 +698,12 @@
         if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
             // dismiss all notifications
             for (int id : mLimitedSimFunctionNotify) {
-                mNotificationManager.cancelAsUser(Integer.toString(id),
+                cancelAsUser(Integer.toString(id),
                         LIMITED_SIM_FUNCTION_NOTIFICATION, UserHandle.ALL);
             }
             mLimitedSimFunctionNotify.clear();
         } else if (mLimitedSimFunctionNotify.contains(subId)) {
-            mNotificationManager.cancelAsUser(Integer.toString(subId),
+            cancelAsUser(Integer.toString(subId),
                     LIMITED_SIM_FUNCTION_NOTIFICATION, UserHandle.ALL);
             mLimitedSimFunctionNotify.remove(subId);
         }
@@ -719,7 +719,7 @@
         // from the old SIM if both old & new SIM configured to display the notification.
         mLimitedSimFunctionNotify.removeIf(id -> {
             if (!mSubscriptionManager.isActiveSubId(id)) {
-                mNotificationManager.cancelAsUser(Integer.toString(id),
+                cancelAsUser(Integer.toString(id),
                         LIMITED_SIM_FUNCTION_NOTIFICATION, UserHandle.ALL);
                 return true;
             }