There could be a rare race condition where getDefaultDataSubscriptionInfo become null during the evaluatin.

Bug: 299242849
Test: manual
Change-Id: I5765bc8fac5362d16aa0976e1f870f91f0de4c2c
This commit is contained in:
Ling Ma
2023-09-26 10:40:24 -07:00
parent 1bb84f9854
commit 8dc7d37187

View File

@@ -265,9 +265,8 @@ public class SubscriptionsPreferenceController extends AbstractPreferenceControl
/**@return {@code true} if subId is the default data sub. **/
private boolean isDds(int subId) {
return mSubscriptionManager.getDefaultDataSubscriptionInfo() != null
&& mSubscriptionManager.getDefaultDataSubscriptionInfo().getSubscriptionId()
== subId;
SubscriptionInfo info = mSubscriptionManager.getDefaultDataSubscriptionInfo();
return info != null && info.getSubscriptionId() == subId;
}
private CharSequence getMobilePreferenceSummary(int subId) {