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

Commit de7c5e50 authored by songferngwang's avatar songferngwang Committed by Automerger Merge Worker
Browse files

Fix the BasePreferenceController.createInstance's IllegalStateException am: 7489c933 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27358857



Change-Id: I7fe4219091a7428f42e4b33d0ccc4445b66569f3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bb81d767 7489c933

src/com/android/settings/network/telephony/CallsDefaultSubscriptionController.java

+4 −0
Original line number Diff line number Diff line
@@ -31,6 +31,10 @@ public class CallsDefaultSubscriptionController extends DefaultSubscriptionContr 
        super(context, preferenceKey, lifecycle, lifecycleOwner);

    }



    public CallsDefaultSubscriptionController(Context context, String preferenceKey) {

        super(context, preferenceKey);

    }



    @Override

    protected int getDefaultSubscriptionId() {

        int defaultCallSubId = SubscriptionManager.getDefaultVoiceSubscriptionId();

src/com/android/settings/network/telephony/ConvertToEsimPreferenceController.java

+6 −2
Original line number Diff line number Diff line
@@ -68,15 +68,19 @@ public class ConvertToEsimPreferenceController extends TelephonyBasePreferenceCo 


    public ConvertToEsimPreferenceController(Context context, String key, Lifecycle lifecycle,

            LifecycleOwner lifecycleOwner, int subId) {

        super(context, key);

        this(context, key);

        mSubId = subId;

        mMobileNetworkRepository = MobileNetworkRepository.getInstance(context);

        mLifecycleOwner = lifecycleOwner;

        if (lifecycle != null) {

            lifecycle.addObserver(this);

        }

    }



    public ConvertToEsimPreferenceController(Context context, String key) {

        super(context, key);

        mMobileNetworkRepository = MobileNetworkRepository.getInstance(context);

    }



    public void init(int subId, SubscriptionInfoEntity subInfoEntity) {

        mSubId = subId;

        mSubscriptionInfoEntity = subInfoEntity;

src/com/android/settings/network/telephony/DefaultSubscriptionController.java

+8 −4
Original line number Diff line number Diff line
@@ -64,16 +64,20 @@ public abstract class DefaultSubscriptionController extends TelephonyBasePrefere 


    public DefaultSubscriptionController(Context context, String preferenceKey, Lifecycle lifecycle,

            LifecycleOwner lifecycleOwner) {

        this(context, preferenceKey);

        mLifecycleOwner = lifecycleOwner;

        if (lifecycle != null) {

            lifecycle.addObserver(this);

        }

    }



    public DefaultSubscriptionController(Context context, String preferenceKey) {

        super(context, preferenceKey);

        mManager = context.getSystemService(SubscriptionManager.class);

        mIsRtlMode = context.getResources().getConfiguration().getLayoutDirection()

                == View.LAYOUT_DIRECTION_RTL;

        mMobileNetworkRepository = MobileNetworkRepository.getInstance(context);

        mDataSubscriptionChangedReceiver = new DefaultSubscriptionReceiver(context, this);

        mLifecycleOwner = lifecycleOwner;

        if (lifecycle != null) {

            lifecycle.addObserver(this);

        }

    }



    /** @return the id of the default subscription for the service, or

src/com/android/settings/network/telephony/MobileDataPreferenceController.java

+7 −3
Original line number Diff line number Diff line
@@ -73,16 +73,20 @@ public class MobileDataPreferenceController extends TelephonyTogglePreferenceCon 


    public MobileDataPreferenceController(Context context, String key, Lifecycle lifecycle,

            LifecycleOwner lifecycleOwner, int subId) {

        super(context, key);

        this(context, key);

        mSubId = subId;

        mSubscriptionManager = context.getSystemService(SubscriptionManager.class);

        mMobileNetworkRepository = MobileNetworkRepository.getInstance(context);

        mLifecycleOwner = lifecycleOwner;

        if (lifecycle != null) {

            lifecycle.addObserver(this);

        }

    }



    public MobileDataPreferenceController(Context context, String key) {

        super(context, key);

        mSubscriptionManager = context.getSystemService(SubscriptionManager.class);

        mMobileNetworkRepository = MobileNetworkRepository.getInstance(context);

    }



    @Override

    public int getAvailabilityStatus(int subId) {

        if (Flags.isDualSimOnboardingEnabled()) {

src/com/android/settings/network/telephony/RoamingPreferenceController.java

+7 −3
Original line number Diff line number Diff line
@@ -63,16 +63,20 @@ public class RoamingPreferenceController extends TelephonyTogglePreferenceContro 


    public RoamingPreferenceController(Context context, String key, Lifecycle lifecycle,

            LifecycleOwner lifecycleOwner, int subId) {

        super(context, key);

        this(context, key);

        mSubId = subId;

        mCarrierConfigManager = context.getSystemService(CarrierConfigManager.class);

        mMobileNetworkRepository = MobileNetworkRepository.getInstance(context);

        mLifecycleOwner = lifecycleOwner;

        if (lifecycle != null) {

            lifecycle.addObserver(this);

        }

    }



    public RoamingPreferenceController(Context context, String key) {

        super(context, key);

        mCarrierConfigManager = context.getSystemService(CarrierConfigManager.class);

        mMobileNetworkRepository = MobileNetworkRepository.getInstance(context);

    }



    @Override

    public int getAvailabilityStatus() {

        final PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(mSubId);