Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8104d5e authored by Betty Chang's avatar Betty Chang Committed by Android (Google) Code Review
Browse files

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

parents dc047e57 ebe36cf9

src/com/android/settings/ResetNetwork.java

+3 −3
Original line number Diff line number Diff line
@@ -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();

            }

src/com/android/settings/ResetNetworkConfirm.java

+1 −1
Original line number Diff line number Diff line
@@ -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));

        }

src/com/android/settings/wifi/CellularFallbackPreferenceController.java

+1 −2
Original line number Diff line number Diff line
@@ -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() {

src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java

+1 −1
Original line number Diff line number Diff line
@@ -639,6 +639,6 @@ public class WifiCallingSettingsForSub extends SettingsPreferenceFragment 


    @VisibleForTesting

    Resources getResourcesForSubId() {

        return SubscriptionManager.getResourcesForSubId(getContext(), mSubId, false);

        return SubscriptionManager.getResourcesForSubId(getContext(), mSubId);

    }

}