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

Changed API name from 'isNtn()' to 'isOnlyNonTerrestrialNetwork()' and updated related methods and variables according to API Council recommendations.

Browse Source 
isNtn() -> isOnlyNonTerrestrialNetwork()
No changes in logic.

Bug: 301620244
Test: PreferredSimDialogFragmentTest SimListDialogFragmentTest
Change-Id: I2b64262ed4d9f81f830f76b10a2174ad1e1d649f
This commit is contained in:
Hakjun Choi
2023-10-04 06:41:38 +00:00
parent d02ebcc3bf
commit aa911b312b
5 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/network/MobileNetworkRepository.java
View File

@@ -705,7 +705,8 @@ public class MobileNetworkRepository extends SubscriptionManager.OnSubscriptions
} }
if (subInfo.isEmbedded() if (subInfo.isEmbedded()
&& (subInfo.getProfileClass() == PROFILE_CLASS_PROVISIONING && (subInfo.getProfileClass() == PROFILE_CLASS_PROVISIONING
|| (Flags.oemEnabledSatelliteFlag() && subInfo.isNtn()))) { || (Flags.oemEnabledSatelliteFlag()
&& subInfo.isOnlyNonTerrestrialNetwork()))) {
if (DEBUG) { if (DEBUG) {
Log.d(TAG, "Do not insert the provisioning or satellite eSIM"); Log.d(TAG, "Do not insert the provisioning or satellite eSIM");
} }

3
src/com/android/settings/sim/CallsSimListDialogFragment.java
View File

@@ -59,7 +59,8 @@ public class CallsSimListDialogFragment extends SimListDialogFragment {
SubscriptionInfo info = subscriptionManager.getActiveSubscriptionInfo(subId); SubscriptionInfo info = subscriptionManager.getActiveSubscriptionInfo(subId);
if (info == null || (info.isEmbedded() if (info == null || (info.isEmbedded()
&& (info.getProfileClass() == PROFILE_CLASS_PROVISIONING && (info.getProfileClass() == PROFILE_CLASS_PROVISIONING
|| (Flags.oemEnabledSatelliteFlag() && info.isNtn())))) { || (Flags.oemEnabledSatelliteFlag()
&& info.isOnlyNonTerrestrialNetwork())))) {
continue; continue;
} }
result.add(subscriptionManager.getActiveSubscriptionInfo(subId)); result.add(subscriptionManager.getActiveSubscriptionInfo(subId));

2
src/com/android/settings/sim/PreferredSimDialogFragment.java
View File

@@ -100,7 +100,7 @@ public class PreferredSimDialogFragment extends SimDialogFragment implements
final SubscriptionInfo info = getPreferredSubscription(); final SubscriptionInfo info = getPreferredSubscription();
if (info == null || (info.isEmbedded() if (info == null || (info.isEmbedded()
&& (info.getProfileClass() == PROFILE_CLASS_PROVISIONING && (info.getProfileClass() == PROFILE_CLASS_PROVISIONING
|| (Flags.oemEnabledSatelliteFlag() && info.isNtn())))) { || (Flags.oemEnabledSatelliteFlag() && info.isOnlyNonTerrestrialNetwork())))) {
dismiss(); dismiss();
return; return;
} }

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

@@ -136,10 +136,12 @@ public class SelectSpecificDataSimDialogFragment extends SimDialogFragment imple
if ((newSubInfo.isEmbedded() if ((newSubInfo.isEmbedded()
&& (newSubInfo.getProfileClass() == PROFILE_CLASS_PROVISIONING && (newSubInfo.getProfileClass() == PROFILE_CLASS_PROVISIONING
|| (Flags.oemEnabledSatelliteFlag() && newSubInfo.isNtn()))) || (Flags.oemEnabledSatelliteFlag()
&& newSubInfo.isOnlyNonTerrestrialNetwork())))
|| (currentDataSubInfo.isEmbedded() || (currentDataSubInfo.isEmbedded()
&& (currentDataSubInfo.getProfileClass() == PROFILE_CLASS_PROVISIONING && (currentDataSubInfo.getProfileClass() == PROFILE_CLASS_PROVISIONING
|| (Flags.oemEnabledSatelliteFlag() && currentDataSubInfo.isNtn())))) { || (Flags.oemEnabledSatelliteFlag()
&& currentDataSubInfo.isOnlyNonTerrestrialNetwork())))) {
Log.d(TAG, "do not set the provisioning or satellite eSIM"); Log.d(TAG, "do not set the provisioning or satellite eSIM");
dismiss(); dismiss();
return; return;

2
src/com/android/settings/sim/SimListDialogFragment.java
View File

@@ -145,7 +145,7 @@ public class SimListDialogFragment extends SimDialogFragment {
// Remove the provisioning or satellite eSIM from the subscription list. // Remove the provisioning or satellite eSIM from the subscription list.
currentSubscriptions.removeIf(info -> info.isEmbedded() currentSubscriptions.removeIf(info -> info.isEmbedded()
&& (info.getProfileClass() == PROFILE_CLASS_PROVISIONING && (info.getProfileClass() == PROFILE_CLASS_PROVISIONING
|| (Flags.oemEnabledSatelliteFlag() && info.isNtn()))); || (Flags.oemEnabledSatelliteFlag() && info.isOnlyNonTerrestrialNetwork())));
boolean includeAskEveryTime = getArguments().getBoolean(KEY_INCLUDE_ASK_EVERY_TIME); boolean includeAskEveryTime = getArguments().getBoolean(KEY_INCLUDE_ASK_EVERY_TIME);
boolean isCancelItemShowed = getArguments().getBoolean(KEY_SHOW_CANCEL_ITEM); boolean isCancelItemShowed = getArguments().getBoolean(KEY_SHOW_CANCEL_ITEM);