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

Merge "[MEP] The condition of "null point check" is wrong" into tm-dev

Browse Source
This commit is contained in:
SongFerng Wang
2022-03-03 12:36:59 +00:00
committed by Android (Google) Code Review
parent 9ca62b2290 ce8232d0a4
commit cdb08ee92a
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/sim/receivers/SimSlotChangeHandler.java
View File

@@ -258,10 +258,11 @@ public class SimSlotChangeHandler {
} }
List<SubscriptionInfo> subscriptionInfos = getAvailableRemovableSubscription(); List<SubscriptionInfo> subscriptionInfos = getAvailableRemovableSubscription();
if (subscriptionInfos == null && subscriptionInfos.get(0) != null) { if (subscriptionInfos == null || subscriptionInfos.get(0) == null) {
Log.e(TAG, "Unable to find the removable subscriptionInfo. Do nothing."); Log.e(TAG, "Unable to find the removable subscriptionInfo. Do nothing.");
return; return;
} }
Log.d(TAG, "getAvailableRemovableSubscription:" + subscriptionInfos);
startSimConfirmDialogActivity(subscriptionInfos.get(0).getSubscriptionId()); startSimConfirmDialogActivity(subscriptionInfos.get(0).getSubscriptionId());
} }
@@ -364,6 +365,7 @@ public class SimSlotChangeHandler {
Log.i(TAG, "Unable to enable subscription due to invalid subscription ID."); Log.i(TAG, "Unable to enable subscription due to invalid subscription ID.");
return; return;
} }
Log.d(TAG, "Start ToggleSubscriptionDialogActivity with " + subId + " under DSDS+Mep.");
Intent intent = ToggleSubscriptionDialogActivity.getIntent(mContext, subId, true); Intent intent = ToggleSubscriptionDialogActivity.getIntent(mContext, subId, true);
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
mContext.startActivity(intent); mContext.startActivity(intent);
@@ -372,7 +374,7 @@ public class SimSlotChangeHandler {
private boolean isMultipleEnabledProfilesSupported() { private boolean isMultipleEnabledProfilesSupported() {
List<UiccCardInfo> cardInfos = mTelMgr.getUiccCardsInfo(); List<UiccCardInfo> cardInfos = mTelMgr.getUiccCardsInfo();
if (cardInfos == null) { if (cardInfos == null) {
Log.w(TAG, "UICC cards info list is empty."); Log.d(TAG, "UICC cards info list is empty.");
return false; return false;
} }
return cardInfos.stream().anyMatch( return cardInfos.stream().anyMatch(