[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
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

View File

@@ -203,7 +203,7 @@ public class ResetNetworkConfirm extends InstrumentedFragment {
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));
}