Merge "Guard the NPE on StartNow slice" into sc-dev am: f7cb316cd2 am: 96431d2f81

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14515932

Change-Id: I57253a85e254a07856ebe4d799cc09a6259c1f49
This commit is contained in:
Stanley Wang
2021-05-14 10:03:22 +00:00
committed by Automerger Merge Worker

View File

@@ -59,8 +59,10 @@ public class StartNowPreferenceController extends SettingsMainSwitchPreferenceCo
@Override @Override
public boolean setChecked(boolean isChecked) { public boolean setChecked(boolean isChecked) {
if (isChecked) { if (isChecked) {
mMetricsFeatureProvider.logClickedPreference(mSwitchPreference, if (mSwitchPreference != null) {
mSwitchPreference.getExtras().getInt(DashboardFragment.CATEGORY)); mMetricsFeatureProvider.logClickedPreference(mSwitchPreference,
mSwitchPreference.getExtras().getInt(DashboardFragment.CATEGORY));
}
mBackend.startDreaming(); mBackend.startDreaming();
} }
return true; return true;