PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix NPE" into main

Browse Source
This commit is contained in:
Treehugger Robot
2023-09-27 05:09:42 +00:00
committed by Android (Google) Code Review
parent 21c967bc96 8dc7d37187
commit 02427bb6ff
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/network/SubscriptionsPreferenceController.java
View File

@@ -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) {