commit 58427f0319a58e0869619f72caa8bf31ddaea6a1
author Bruno Martins <bgcngm@gmail.com> Sat Sep 30 23:18:22 2023 +0100
committer Bruno Martins <bgcngm@gmail.com> Sat Sep 30 23:29:33 2023 +0100
tree ea0e9b1df3f1c0b3fd0cdcbfbc20717459c378d4
parent 9ace1904c365df9204fd573d078ea6e6dee83426

AirplaneModePreferenceController: Fix NPE when toggle is hidden

When airplane mode toggle is not available, i.e. the overlay
config_show_toggle_airplane is set to false, the Settings app
will crash when leaving "Network and Internet" menu.

Change-Id: Iaf5bd05d59091ba615a55eedc5243806a627da7b

src/com/android/settings/network/AirplaneModePreferenceController.java

diff --git a/src/com/android/settings/network/AirplaneModePreferenceController.java b/src/com/android/settings/network/AirplaneModePreferenceController.java
index 720a334..9ae9a17 100644
--- a/src/com/android/settings/network/AirplaneModePreferenceController.java
+++ b/src/com/android/settings/network/AirplaneModePreferenceController.java
@@ -141,7 +141,9 @@
 
     @Override
     public void onDestroy() {
-        mAirplaneModeEnabler.close();
+        if (isAvailable()) {
+            mAirplaneModeEnabler.close();
+        }
     }