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

Commit 762e1932 authored by SongFerngWang's avatar SongFerngWang
Browse files

mainline: remove CarrierConfigManager.init 

Bug: 147469789
Test:  make RunSettingsRoboTests ROBOTEST_FILTER=\
ApnPreferenceControllerTest (PASS)
make RunSettingsRoboTests ROBOTEST_FILTER=\
CarrierPreferenceControllerTest (PASS)
Change-Id: I2a72d409574fc281e5de57d58a27551dd040d551
parent 8b1b6977

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

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ public class ApnPreferenceController extends TelephonyBasePreferenceController i 


    public ApnPreferenceController(Context context, String key) {

        super(context, key);

        mCarrierConfigManager = new CarrierConfigManager(context);

        mCarrierConfigManager = context.getSystemService(CarrierConfigManager.class);

        mDpcApnEnforcedObserver = new DpcApnEnforcedObserver(new Handler(Looper.getMainLooper()));

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ public class CarrierPreferenceController extends TelephonyBasePreferenceControll 


    public CarrierPreferenceController(Context context, String key) {

        super(context, key);

        mCarrierConfigManager = new CarrierConfigManager(context);

        mCarrierConfigManager = context.getSystemService(CarrierConfigManager.class);

    }



    public void init(int subId) {

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

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ public class RoamingDialogFragment extends InstrumentedDialogFragment implements 
        super.onAttach(context);

        final Bundle args = getArguments();

        mSubId = args.getInt(SUB_ID_KEY);

        mCarrierConfigManager = new CarrierConfigManager(context);

        mCarrierConfigManager = context.getSystemService(CarrierConfigManager.class);

    }



    @Override