commit 7f34c9ccf2883bde28129968d22c184a9e7db380
author Meng Wang <mewan@google.com> Tue Jan 14 14:57:57 2020 -0800
committer Meng Wang <mewan@google.com> Tue Jan 14 14:59:26 2020 -0800
tree 58ba42c7d317acd0dafe797775e6321c3e7d40d1
parent e7d29d4656cfac40dfa9cd989fa47a348055ad4f

Do not use hidden PhoneStateListener.mSubId

Bug: 137202333
Test: make
Change-Id: I869f8c350c2d71dbcf3533f1aa9845c0b8d94ee3

src/com/android/phone/CallNotifier.java

diff --git a/src/com/android/phone/CallNotifier.java b/src/com/android/phone/CallNotifier.java
index 0af1b23..f9938ce 100644
--- a/src/com/android/phone/CallNotifier.java
+++ b/src/com/android/phone/CallNotifier.java
@@ -616,7 +616,7 @@
         for (int i = 0; i < subInfos.size(); i++) {
             int subId = subInfos.get(i).getSubscriptionId();
             if (!mPhoneStateListeners.containsKey(subId)) {
-                CallNotifierPhoneStateListener listener = new CallNotifierPhoneStateListener();
+                CallNotifierPhoneStateListener listener = new CallNotifierPhoneStateListener(subId);
                 mTelephonyManager.createForSubscriptionId(subId).listen(listener,
                         PhoneStateListener.LISTEN_MESSAGE_WAITING_INDICATOR
                         | PhoneStateListener.LISTEN_CALL_FORWARDING_INDICATOR);
@@ -768,8 +768,11 @@
             };
 
     private class CallNotifierPhoneStateListener extends PhoneStateListener {
-        public CallNotifierPhoneStateListener() {
+        private final int mSubId;
+
+        CallNotifierPhoneStateListener(int subId) {
             super();
+            this.mSubId = subId;
         }
 
         @Override