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

[Mainline] To use @SystemApi to replace non-formal APIs for mainline

Browse Source 
- 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
This commit is contained in:
changbetty
2020-01-08 22:06:26 +08:00
parent 6b7b92ced5
commit ebe36cf96c
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/ResetNetwork.java
View File

@@ -170,13 +170,13 @@ public class ResetNetwork extends InstrumentedFragment {
if (mSubscriptions != null && mSubscriptions.size() > 0) { if (mSubscriptions != null && mSubscriptions.size() > 0) {
// Get the default subscription in the order of data, voice, sms, first up. // Get the default subscription in the order of data, voice, sms, first up.
int defaultSubscription = SubscriptionManager.getDefaultDataSubscriptionId(); int defaultSubscription = SubscriptionManager.getDefaultDataSubscriptionId();
if (!SubscriptionManager.isUsableSubIdValue(defaultSubscription)) { if (!SubscriptionManager.isUsableSubscriptionId(defaultSubscription)) {
defaultSubscription = SubscriptionManager.getDefaultVoiceSubscriptionId(); defaultSubscription = SubscriptionManager.getDefaultVoiceSubscriptionId();
} }
if (!SubscriptionManager.isUsableSubIdValue(defaultSubscription)) { if (!SubscriptionManager.isUsableSubscriptionId(defaultSubscription)) {
defaultSubscription = SubscriptionManager.getDefaultSmsSubscriptionId(); defaultSubscription = SubscriptionManager.getDefaultSmsSubscriptionId();
} }
if (!SubscriptionManager.isUsableSubIdValue(defaultSubscription)) { if (!SubscriptionManager.isUsableSubscriptionId(defaultSubscription)) {
defaultSubscription = SubscriptionManager.getDefaultSubscriptionId(); defaultSubscription = SubscriptionManager.getDefaultSubscriptionId();
} }

2
src/com/android/settings/ResetNetworkConfirm.java
View File

@@ -203,7 +203,7 @@ public class ResetNetworkConfirm extends InstrumentedFragment {
private void restoreDefaultApn(Context context) { private void restoreDefaultApn(Context context) {
Uri uri = Uri.parse(ApnSettings.RESTORE_CARRIERS_URI); Uri uri = Uri.parse(ApnSettings.RESTORE_CARRIERS_URI);
if (SubscriptionManager.isUsableSubIdValue(mSubId)) { if (SubscriptionManager.isUsableSubscriptionId(mSubId)) {
uri = Uri.withAppendedPath(uri, "subId/" + String.valueOf(mSubId)); uri = Uri.withAppendedPath(uri, "subId/" + String.valueOf(mSubId));
} }

3
src/com/android/settings/wifi/CellularFallbackPreferenceController.java
View File

@@ -68,8 +68,7 @@ public class CellularFallbackPreferenceController extends TogglePreferenceContro
@VisibleForTesting @VisibleForTesting
Resources getResourcesForSubId(int subscriptionId) { Resources getResourcesForSubId(int subscriptionId) {
return SubscriptionManager.getResourcesForSubId(mContext, subscriptionId, return SubscriptionManager.getResourcesForSubId(mContext, subscriptionId);
false /* useRootLocale */);
} }
private boolean avoidBadWifiCurrentSettings() { private boolean avoidBadWifiCurrentSettings() {

2
src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java
View File

@@ -639,6 +639,6 @@ public class WifiCallingSettingsForSub extends SettingsPreferenceFragment
@VisibleForTesting @VisibleForTesting
Resources getResourcesForSubId() { Resources getResourcesForSubId() {
return SubscriptionManager.getResourcesForSubId(getContext(), mSubId, false); return SubscriptionManager.getResourcesForSubId(getContext(), mSubId);
} }
} }