Merge "Fix NPE for ConfigureNotificationSettings" into sc-dev am: d604ca93dc

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2d82fe3b483f581f3786e3b6fb17cae83581ec35
This commit is contained in:
Yanting Yang
2021-03-13 17:07:24 +00:00
committed by Automerger Merge Worker

View File

@@ -127,6 +127,8 @@ public class ConfigureNotificationSettings extends DashboardFragment implements
@Override @Override
public void onCreate(Bundle icicle) { public void onCreate(Bundle icicle) {
super.onCreate(icicle); super.onCreate(icicle);
// TODO(b/182237530): This method should be removed when this flag is deprecated.
if (!FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.SILKY_HOME)) {
final PreferenceScreen screen = getPreferenceScreen(); final PreferenceScreen screen = getPreferenceScreen();
final Bundle arguments = getArguments(); final Bundle arguments = getArguments();
@@ -144,6 +146,7 @@ public class ConfigureNotificationSettings extends DashboardFragment implements
} }
} }
} }
}
@Override @Override
public boolean onPreferenceTreeClick(Preference preference) { public boolean onPreferenceTreeClick(Preference preference) {