From e78fd23820238c882e4670590fa84e8f0db68060 Mon Sep 17 00:00:00 2001 From: YK Hung Date: Fri, 29 Mar 2024 02:40:07 +0000 Subject: [PATCH] NPE protection for invokeJobRecheck() in the fragment Ensure getContext() is not null before invokeJobRecheck() in the background, since the main fragment may be detached to return null context (in the corner case) Test: atest Fix: 331719252 Change-Id: Ia7ba757d2e6ebaf3fd371af51270c0eb0ad0a9f7 --- .../settings/fuelgauge/batteryusage/PowerUsageAdvanced.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/fuelgauge/batteryusage/PowerUsageAdvanced.java b/src/com/android/settings/fuelgauge/batteryusage/PowerUsageAdvanced.java index 65d941df355..14e07d3baa2 100644 --- a/src/com/android/settings/fuelgauge/batteryusage/PowerUsageAdvanced.java +++ b/src/com/android/settings/fuelgauge/batteryusage/PowerUsageAdvanced.java @@ -95,7 +95,11 @@ public class PowerUsageAdvanced extends PowerUsageBase { super.onCreate(icicle); mHistPref = findPreference(KEY_BATTERY_CHART); setBatteryChartPreferenceController(); - AsyncTask.execute(() -> BootBroadcastReceiver.invokeJobRecheck(getContext())); + AsyncTask.execute(() -> { + if (getContext() != null) { + BootBroadcastReceiver.invokeJobRecheck(getContext()); + } + }); } @Override