commit 3658b47647f9148d69ac7c56e40a5a2dc18c5867
author Wei Liu <luciferleo@google.com> Tue Aug 11 21:27:38 2015 -0700
committer Wei Liu <luciferleo@google.com> Tue Aug 11 21:27:38 2015 -0700
tree 28d876ab70771d8ddabc2991d93c3db3340ecbfb
parent f9c52eae2e4f9183c17441d34e27177eb1d51fdb

Do not turn on cellular radio if enable_cellular_on_boot is false.

b/22804423

Change-Id: I9e4361d049aca93a44e279c901bec497ac0c161b

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

diff --git a/src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java b/src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
index a8abd41..8d71e38 100644
--- a/src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
+++ b/src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
@@ -200,7 +200,9 @@
 
         // 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

diff --git a/src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java b/src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
index 23f1df2..5d3fde9 100755
--- a/src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
+++ b/src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
@@ -226,7 +226,10 @@
         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(