Merge "Persist user-triggered radio off reason across reboots" am: 572a69c72d am: 65cd8009f0temp_ab_7272582

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1667565

Change-Id: I6d9af465e649aa6110935ef50b5966a3725c2aac

1 files changed, 3 insertions, 0 deletions

diff --git a/src/java/com/android/internal/telephony/ServiceStateTracker.java b/src/java/com/android/internal/telephony/ServiceStateTracker.java
index ccc8539cc6..868551f3ea 100755
--- a/src/java/com/android/internal/telephony/ServiceStateTracker.java
+++ b/src/java/com/android/internal/telephony/ServiceStateTracker.java
@@ -704,6 +704,9 @@ public class ServiceStateTracker extends Handler {
         int enableCellularOnBoot = Settings.Global.getInt(mCr,
                 Settings.Global.ENABLE_CELLULAR_ON_BOOT, 1);
         mDesiredPowerState = (enableCellularOnBoot > 0) && ! (airplaneMode > 0);
+        if (!mDesiredPowerState) {
+            sRadioPowerOffReasons.add(Phone.RADIO_POWER_REASON_USER);
+        }
         mRadioPowerLog.log("init : airplane mode = " + airplaneMode + " enableCellularOnBoot = " +
                 enableCellularOnBoot);