commit 5388ca273e1efd74b508044fae0eb55baf7bd75b
author Amit Mahajan <amitmahajan@google.com> Tue Jun 22 22:47:59 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 22 22:47:59 2021 +0000
tree b5125f18ee14c478608b3dc5e9594c8887f25e94
parent 06f158d565d6df1fa544ff7eb708fb85ee23b0eb
parent 3dc572b1c1d13ebb5d84b19516767e242657bb87

Merge "Get APM state from ACTION_AIRPLANE_MODE_CHANGED intent instead"

src/com/android/phone/PhoneGlobals.java

diff --git a/src/com/android/phone/PhoneGlobals.java b/src/com/android/phone/PhoneGlobals.java
index e8a6cb4..d09bd77 100644
--- a/src/com/android/phone/PhoneGlobals.java
+++ b/src/com/android/phone/PhoneGlobals.java
@@ -477,7 +477,7 @@
 
             // Initialize cell status using current airplane mode.
             handleAirplaneModeChange(this, Settings.Global.getInt(getContentResolver(),
-                    Settings.Global.AIRPLANE_MODE_ON, AIRPLANE_OFF));
+                    Settings.Global.AIRPLANE_MODE_ON, AIRPLANE_OFF) == AIRPLANE_ON);
 
             // Register for misc other intent broadcasts.
             IntentFilter intentFilter =
@@ -629,10 +629,9 @@
         notifier.updateCallNotifierRegistrationsAfterRadioTechnologyChange();
     }
 
-    private void handleAirplaneModeChange(Context context, int newMode) {
+    private void handleAirplaneModeChange(Context context, boolean isAirplaneNewlyOn) {
         int cellState = Settings.Global.getInt(context.getContentResolver(),
                 Settings.Global.CELL_ON, PhoneConstants.CELL_ON_FLAG);
-        boolean isAirplaneNewlyOn = (newMode == 1);
         switch (cellState) {
             case PhoneConstants.CELL_OFF_FLAG:
                 // Airplane mode does not affect the cell radio if user
@@ -715,12 +714,7 @@
         public void onReceive(Context context, Intent intent) {
             String action = intent.getAction();
             if (action.equals(Intent.ACTION_AIRPLANE_MODE_CHANGED)) {
-                int airplaneMode = Settings.Global.getInt(getContentResolver(),
-                        Settings.Global.AIRPLANE_MODE_ON, AIRPLANE_OFF);
-                // Treat any non-OFF values as ON.
-                if (airplaneMode != AIRPLANE_OFF) {
-                    airplaneMode = AIRPLANE_ON;
-                }
+                boolean airplaneMode = intent.getBooleanExtra("state", false);
                 handleAirplaneModeChange(context, airplaneMode);
             } else if (action.equals(TelephonyIntents.ACTION_SIM_STATE_CHANGED)) {
                 // re-register as it may be a new IccCard