Merge "Fix NPE" into main (02427bb6) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/network/SubscriptionsPreferenceController.java

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -265,9 +265,8 @@ public class SubscriptionsPreferenceController extends AbstractPreferenceControl

	/@return {@code true} if subId is the default data sub. /		/@return {@code true} if subId is the default data sub. /
	private boolean isDds(int subId) {		private boolean isDds(int subId) {
	return mSubscriptionManager.getDefaultDataSubscriptionInfo() != null		SubscriptionInfo info = mSubscriptionManager.getDefaultDataSubscriptionInfo();
	&& mSubscriptionManager.getDefaultDataSubscriptionInfo().getSubscriptionId()		return info != null && info.getSubscriptionId() == subId;
	== subId;
	}		}

	private CharSequence getMobilePreferenceSummary(int subId) {		private CharSequence getMobilePreferenceSummary(int subId) {