Allow PhoneAccountHandle in SubscriptionInfoHelper
SubscriptionInfoHelper is used by voicemail settings to determine which
account the settings is for. Previously ACTION_CONFIGURE_VOICEMAIL
states TelephonyManager.EXTRA_PHONE_ACCOUNT_HANDLE can be used to
specify account but only subId was supported.
Fixes: 69313740
Test: make
Change-Id: I559af5d6cbac6ad090c6b33a37a41ad49deca136
diff --git a/src/com/android/phone/NotificationMgr.java b/src/com/android/phone/NotificationMgr.java
index fbb6dc5..a21bdcc 100644
--- a/src/com/android/phone/NotificationMgr.java
+++ b/src/com/android/phone/NotificationMgr.java
@@ -45,7 +45,6 @@
import android.telephony.ServiceState;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
-import android.telephony.SubscriptionManager.OnSubscriptionsChangedListener;
import android.telephony.TelephonyManager;
import android.text.TextUtils;
import android.util.ArrayMap;
@@ -171,7 +170,7 @@
/* package */ void refreshMwi(int subId) {
// In a single-sim device, subId can be -1 which means "no sub id". In this case we will
// reference the single subid stored in the mMwiVisible map.
- if (subId == SubscriptionInfoHelper.NO_SUB_ID) {
+ if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
if (mMwiVisible.keySet().size() == 1) {
Set<Integer> keySet = mMwiVisible.keySet();
Iterator<Integer> keyIt = keySet.iterator();