From f2c664abd97952d28a1890beeff8ffb6a8d7c290 Mon Sep 17 00:00:00 2001 From: Stanley Wang Date: Thu, 13 May 2021 18:09:00 +0800 Subject: [PATCH] Guard the NPE on StartNow slice Check if preference is null to avoid NPE when the StartNowPreferenceController is called by slice. Fixes: 187806890 Test: robotest Change-Id: I84c1ee42bc1fd87dd720061e3af81e926028181d --- .../settings/dream/StartNowPreferenceController.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/dream/StartNowPreferenceController.java b/src/com/android/settings/dream/StartNowPreferenceController.java index ed0a4dbeece..f6a79ccea01 100644 --- a/src/com/android/settings/dream/StartNowPreferenceController.java +++ b/src/com/android/settings/dream/StartNowPreferenceController.java @@ -59,8 +59,10 @@ public class StartNowPreferenceController extends SettingsMainSwitchPreferenceCo @Override public boolean setChecked(boolean isChecked) { if (isChecked) { - mMetricsFeatureProvider.logClickedPreference(mSwitchPreference, - mSwitchPreference.getExtras().getInt(DashboardFragment.CATEGORY)); + if (mSwitchPreference != null) { + mMetricsFeatureProvider.logClickedPreference(mSwitchPreference, + mSwitchPreference.getExtras().getInt(DashboardFragment.CATEGORY)); + } mBackend.startDreaming(); } return true;