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

The carrier name is wrong in the dialog am: f513452d4b

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063557

Change-Id: I3582f4af795152245bcb57b08550e3e994cb0853
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
SongFerngWang
2022-04-14 08:24:06 +00:00
committed by Automerger Merge Worker
parent d4b95990e9 f513452d4b
commit c70bde0995
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/android/settings/sim/SelectSpecificDataSimDialogFragment.java
View File

@@ -88,10 +88,11 @@ public class SelectSpecificDataSimDialogFragment extends SimDialogFragment imple
if (subInfos == null || dds == null) { if (subInfos == null || dds == null) {
return null; return null;
} }
return subInfos.stream().filter(subinfo -> subinfo != dds).findFirst().orElse(null); return subInfos.stream().filter(subinfo -> subinfo.getSubscriptionId()
!= dds.getSubscriptionId()).findFirst().orElse(null);
} }
private SubscriptionInfo getDefaultDataSubId() { private SubscriptionInfo getDefaultDataSubInfo() {
return getSubscriptionManager().getDefaultDataSubscriptionInfo(); return getSubscriptionManager().getDefaultDataSubscriptionInfo();
} }
@@ -101,20 +102,22 @@ public class SelectSpecificDataSimDialogFragment extends SimDialogFragment imple
return; return;
} }
SubscriptionInfo activeSubInfo = getDefaultDataSubId(); SubscriptionInfo currentDataSubInfo = getDefaultDataSubInfo();
SubscriptionInfo newSubInfo = getNonDefaultDataSubscriptionInfo(activeSubInfo); SubscriptionInfo newSubInfo = getNonDefaultDataSubscriptionInfo(currentDataSubInfo);
if (newSubInfo == null || activeSubInfo == null) { if (newSubInfo == null || currentDataSubInfo == null) {
Log.d(TAG, "one of target SubscriptionInfos is null");
dismiss(); dismiss();
return; return;
} }
Log.d(TAG, "newSubId: " + newSubInfo.getSubscriptionId()
+ "currentDataSubID: " + currentDataSubInfo.getSubscriptionId());
setTargetSubscriptionInfo(newSubInfo); setTargetSubscriptionInfo(newSubInfo);
CharSequence newDataCarrierName = SubscriptionUtil.getUniqueSubscriptionDisplayName( CharSequence newDataCarrierName = SubscriptionUtil.getUniqueSubscriptionDisplayName(
newSubInfo, getContext()); newSubInfo, getContext());
CharSequence currentDataCarrierName = SubscriptionUtil.getUniqueSubscriptionDisplayName( CharSequence currentDataCarrierName = SubscriptionUtil.getUniqueSubscriptionDisplayName(
activeSubInfo, getContext()); currentDataSubInfo, getContext());
String positive = getContext().getString( String positive = getContext().getString(
R.string.select_specific_sim_for_data_button, newDataCarrierName); R.string.select_specific_sim_for_data_button, newDataCarrierName);