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

Commit 8ddd0da0 authored by Bonian Chen's avatar Bonian Chen Committed by Gerrit Code Review
Browse files

Merge "[Settings] Adopting public API"

parents 126df644 1247771b

src/com/android/settings/ResetNetwork.java

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ public class ResetNetwork extends InstrumentedFragment { 
        mEsimCheckbox = mContentView.findViewById(R.id.erase_esim);



        mSubscriptions = SubscriptionManager.from(getActivity())

                .getActiveSubscriptionInfoList(true);

                .getActiveSubscriptionInfoList();

        if (mSubscriptions != null && mSubscriptions.size() > 0) {

            // Get the default subscription in the order of data, voice, sms, first up.

            int defaultSubscription = SubscriptionManager.getDefaultDataSubscriptionId();

src/com/android/settings/datausage/DataUsageUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ public final class DataUsageUtils extends com.android.settingslib.net.DataUsageU 
            return SystemProperties.get(DataUsageUtils.TEST_RADIOS_PROP).contains("mobile");

        }

        final List<SubscriptionInfo> subInfoList =

                SubscriptionManager.from(context).getActiveSubscriptionInfoList(true);

                SubscriptionManager.from(context).getActiveSubscriptionInfoList();

        // No activated Subscriptions

        if (subInfoList == null) {

            if (LOGD) {

src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java

+2 −2
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ public class PhoneNumberPreferenceController extends BasePreferenceController { 


    private CharSequence getFirstPhoneNumber() {

        final List<SubscriptionInfo> subscriptionInfoList =

                mSubscriptionManager.getActiveSubscriptionInfoList(true);

                mSubscriptionManager.getActiveSubscriptionInfoList();

        if (subscriptionInfoList == null || subscriptionInfoList.isEmpty()) {

            return mContext.getText(R.string.device_info_default);

        }
@@ -144,7 +144,7 @@ public class PhoneNumberPreferenceController extends BasePreferenceController { 
    @VisibleForTesting

    SubscriptionInfo getSubscriptionInfo(int simSlot) {

        final List<SubscriptionInfo> subscriptionInfoList =

                mSubscriptionManager.getActiveSubscriptionInfoList(true);

                mSubscriptionManager.getActiveSubscriptionInfoList();

        if (subscriptionInfoList != null) {

            for (SubscriptionInfo info : subscriptionInfoList) {

                if (info.getSimSlotIndex() == simSlot) {

src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ public class SimStatusPreferenceController extends 


    private CharSequence getCarrierName(int simSlot) {

        final List<SubscriptionInfo> subscriptionInfoList =

                mSubscriptionManager.getActiveSubscriptionInfoList(true);

                mSubscriptionManager.getActiveSubscriptionInfoList();

        if (subscriptionInfoList != null) {

            for (SubscriptionInfo info : subscriptionInfoList) {

                if (info.getSimSlotIndex() == simSlot) {

src/com/android/settings/homepage/contextualcards/deviceinfo/DeviceInfoSlice.java

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ public class DeviceInfoSlice implements CustomSliceable { 
    @VisibleForTesting

    SubscriptionInfo getFirstSubscriptionInfo() {

        final List<SubscriptionInfo> subscriptionInfoList =

                mSubscriptionManager.getActiveSubscriptionInfoList(true);

                mSubscriptionManager.getActiveSubscriptionInfoList();

        if (subscriptionInfoList == null || subscriptionInfoList.isEmpty()) {

            return null;

        }