[Mainline] To use @SystemApi to replace non-formal APIs for mainline
- getResourcesForSubId(Context, int, boolean)
- @SystemApi getResourcesForSubId(Context, int)
- isUsableSubIdValue(int subId)
- public isUsableSubscriptionId(int subId)
Bug: 147206736
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ResetNetworkTest
make RunSettingsRoboTests ROBOTEST_FILTER=ResetNetworkConfirmTest
make RunSettingsRoboTests ROBOTEST_FILTER=CellularFallbackPreferenceControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=WifiCallingSettingsForSubTest
Change-Id: I1a67db80b114a438afda7d45af90e54af38703c3
diff --git a/src/com/android/settings/ResetNetwork.java b/src/com/android/settings/ResetNetwork.java
index 5ac2c0b..e2adcc7 100644
--- a/src/com/android/settings/ResetNetwork.java
+++ b/src/com/android/settings/ResetNetwork.java
@@ -170,13 +170,13 @@
if (mSubscriptions != null && mSubscriptions.size() > 0) {
// Get the default subscription in the order of data, voice, sms, first up.
int defaultSubscription = SubscriptionManager.getDefaultDataSubscriptionId();
- if (!SubscriptionManager.isUsableSubIdValue(defaultSubscription)) {
+ if (!SubscriptionManager.isUsableSubscriptionId(defaultSubscription)) {
defaultSubscription = SubscriptionManager.getDefaultVoiceSubscriptionId();
}
- if (!SubscriptionManager.isUsableSubIdValue(defaultSubscription)) {
+ if (!SubscriptionManager.isUsableSubscriptionId(defaultSubscription)) {
defaultSubscription = SubscriptionManager.getDefaultSmsSubscriptionId();
}
- if (!SubscriptionManager.isUsableSubIdValue(defaultSubscription)) {
+ if (!SubscriptionManager.isUsableSubscriptionId(defaultSubscription)) {
defaultSubscription = SubscriptionManager.getDefaultSubscriptionId();
}
diff --git a/src/com/android/settings/ResetNetworkConfirm.java b/src/com/android/settings/ResetNetworkConfirm.java
index ee11ce0..9f1b8fb 100644
--- a/src/com/android/settings/ResetNetworkConfirm.java
+++ b/src/com/android/settings/ResetNetworkConfirm.java
@@ -203,7 +203,7 @@
private void restoreDefaultApn(Context context) {
Uri uri = Uri.parse(ApnSettings.RESTORE_CARRIERS_URI);
- if (SubscriptionManager.isUsableSubIdValue(mSubId)) {
+ if (SubscriptionManager.isUsableSubscriptionId(mSubId)) {
uri = Uri.withAppendedPath(uri, "subId/" + String.valueOf(mSubId));
}
diff --git a/src/com/android/settings/wifi/CellularFallbackPreferenceController.java b/src/com/android/settings/wifi/CellularFallbackPreferenceController.java
index 659ddbe..eab50a6 100644
--- a/src/com/android/settings/wifi/CellularFallbackPreferenceController.java
+++ b/src/com/android/settings/wifi/CellularFallbackPreferenceController.java
@@ -68,8 +68,7 @@
@VisibleForTesting
Resources getResourcesForSubId(int subscriptionId) {
- return SubscriptionManager.getResourcesForSubId(mContext, subscriptionId,
- false /* useRootLocale */);
+ return SubscriptionManager.getResourcesForSubId(mContext, subscriptionId);
}
private boolean avoidBadWifiCurrentSettings() {
diff --git a/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java b/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java
index 5f26e2d..ea34fce 100644
--- a/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java
+++ b/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java
@@ -639,6 +639,6 @@
@VisibleForTesting
Resources getResourcesForSubId() {
- return SubscriptionManager.getResourcesForSubId(getContext(), mSubId, false);
+ return SubscriptionManager.getResourcesForSubId(getContext(), mSubId);
}
}