From 58427f0319a58e0869619f72caa8bf31ddaea6a1 Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Sat, 30 Sep 2023 23:18:22 +0100 Subject: [PATCH] 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 --- .../settings/network/AirplaneModePreferenceController.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/network/AirplaneModePreferenceController.java b/src/com/android/settings/network/AirplaneModePreferenceController.java index 720a33409c2..9ae9a174a83 100644 --- a/src/com/android/settings/network/AirplaneModePreferenceController.java +++ b/src/com/android/settings/network/AirplaneModePreferenceController.java @@ -141,7 +141,9 @@ public class AirplaneModePreferenceController extends TogglePreferenceController @Override public void onDestroy() { - mAirplaneModeEnabler.close(); + if (isAvailable()) { + mAirplaneModeEnabler.close(); + } }