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 am: c70bde0995

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

Change-Id: Ic6d51241edee333838e7b9d0472dd8267db68794
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
SongFerngWang
2022-04-14 09:59:22 +00:00
committed by Automerger Merge Worker
parent de8a16419e c70bde0995
commit d4ca5a289f
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) {
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();
}
@@ -101,20 +102,22 @@ public class SelectSpecificDataSimDialogFragment extends SimDialogFragment imple
return;
}
SubscriptionInfo activeSubInfo = getDefaultDataSubId();
SubscriptionInfo newSubInfo = getNonDefaultDataSubscriptionInfo(activeSubInfo);
SubscriptionInfo currentDataSubInfo = getDefaultDataSubInfo();
SubscriptionInfo newSubInfo = getNonDefaultDataSubscriptionInfo(currentDataSubInfo);
if (newSubInfo == null || activeSubInfo == null) {
if (newSubInfo == null || currentDataSubInfo == null) {
Log.d(TAG, "one of target SubscriptionInfos is null");
dismiss();
return;
}
Log.d(TAG, "newSubId: " + newSubInfo.getSubscriptionId()
+ "currentDataSubID: " + currentDataSubInfo.getSubscriptionId());
setTargetSubscriptionInfo(newSubInfo);
CharSequence newDataCarrierName = SubscriptionUtil.getUniqueSubscriptionDisplayName(
newSubInfo, getContext());
CharSequence currentDataCarrierName = SubscriptionUtil.getUniqueSubscriptionDisplayName(
activeSubInfo, getContext());
currentDataSubInfo, getContext());
String positive = getContext().getString(
R.string.select_specific_sim_for_data_button, newDataCarrierName);