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

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

Browse Source
This commit is contained in:
Betty Chang
2020-01-09 06:50:13 +00:00
committed by Android (Google) Code Review
parent dc047e5746 ebe36cf96c
commit b8104d5e70
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) {
// 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();
}

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

@@ -199,7 +199,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));
}

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

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

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

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