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

Commit 0165a9fe authored by Wei Liu's avatar Wei Liu Committed by Android (Google) Code Review
Browse files

Merge "Do not turn on cellular radio if enable_cellular_on_boot is false." into cw-e-dev

parents fe333ebe 3658b476

src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java

+3 −1
Original line number Diff line number Diff line
@@ -200,7 +200,9 @@ public class CdmaServiceStateTracker extends ServiceStateTracker { 


        // System setting property AIRPLANE_MODE_ON is set in Settings.

        int airplaneMode = Settings.Global.getInt(mCr, Settings.Global.AIRPLANE_MODE_ON, 0);

        mDesiredPowerState = ! (airplaneMode > 0);

        int enableCellularOnBoot = Settings.Global.getInt(mCr,

                Settings.Global.ENABLE_CELLULAR_ON_BOOT, 1);

        mDesiredPowerState = (enableCellularOnBoot > 0) && ! (airplaneMode > 0);



        mCr.registerContentObserver(

                Settings.Global.getUriFor(Settings.Global.AUTO_TIME), true,

src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java

+4 −1
Original line number Diff line number Diff line
@@ -226,7 +226,10 @@ final class GsmServiceStateTracker extends ServiceStateTracker { 
        int airplaneMode = Settings.Global.getInt(

                phone.getContext().getContentResolver(),

                Settings.Global.AIRPLANE_MODE_ON, 0);

        mDesiredPowerState = ! (airplaneMode > 0);

        int enableCellularOnBoot = Settings.Global.getInt(

                phone.getContext().getContentResolver(),

                Settings.Global.ENABLE_CELLULAR_ON_BOOT, 1);

        mDesiredPowerState = (enableCellularOnBoot > 0) && ! (airplaneMode > 0);



        mCr = phone.getContext().getContentResolver();

        mCr.registerContentObserver(