Merge "Guard the NPE on StartNow slice" into sc-dev

2021-05-14 07:39:38 +00:00
parent f6712e330a f2c664abd9
commit f7cb316cd2
1 changed files with 4 additions and 2 deletions
--- 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;