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

Merge "The Network Select shows wrong operator name" into sc-dev am: c7d2169120

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

Change-Id: I7e70fc63e1e17bddfe38455717af5e24d9a9df7c
This commit is contained in:
SongFerng Wang
2021-04-12 02:49:09 +00:00
committed by Automerger Merge Worker
parent ce080e6c66 c7d2169120
commit 8991225949
3 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/network/telephony/MobileNetworkUtils.java
View File

@@ -648,12 +648,8 @@ public class MobileNetworkUtils {
return getOperatorNameFromTelephonyManager(context); return getOperatorNameFromTelephonyManager(context);
} }
private static SubscriptionInfo getSubscriptionInfo(SubscriptionManager subManager, private static SubscriptionInfo getSubscriptionInfo(SubscriptionManager subManager, int subId) {
int subId) { List<SubscriptionInfo> subInfos = subManager.getActiveSubscriptionInfoList();
List<SubscriptionInfo> subInfos = subManager.getAccessibleSubscriptionInfoList();
if (subInfos == null) {
subInfos = subManager.getActiveSubscriptionInfoList();
}
if (subInfos == null) { if (subInfos == null) {
return null; return null;
} }

2
tests/unit/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java
View File

@@ -132,8 +132,6 @@ public class MobileNetworkUtilsTest {
when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn( when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(
Arrays.asList(mSubscriptionInfo1, mSubscriptionInfo2)); Arrays.asList(mSubscriptionInfo1, mSubscriptionInfo2));
when(mSubscriptionManager.getAccessibleSubscriptionInfoList()).thenReturn(
Arrays.asList(mSubscriptionInfo1, mSubscriptionInfo2));
when(mTelephonyManager.getNetworkOperatorName()).thenReturn( when(mTelephonyManager.getNetworkOperatorName()).thenReturn(
PLMN_FROM_TELEPHONY_MANAGER_API); PLMN_FROM_TELEPHONY_MANAGER_API);

2
tests/unit/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceControllerTest.java
View File

@@ -88,8 +88,6 @@ public class OpenNetworkSelectPagePreferenceControllerTest {
when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn( when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(
Arrays.asList(mSubscriptionInfo)); Arrays.asList(mSubscriptionInfo));
when(mSubscriptionManager.getAccessibleSubscriptionInfoList()).thenReturn(
Arrays.asList(mSubscriptionInfo));
when(mTelephonyManager.getNetworkOperatorName()).thenReturn(OPERATOR_NAME); when(mTelephonyManager.getNetworkOperatorName()).thenReturn(OPERATOR_NAME);