Fix NPE in SettingsMainSwitchPreference.
- Check if the RestrictedPreferenceHelper is null to avoid NPE.
Fix: 190135868
Test: run robotest and manually test that page.
Change-Id: I746099260d8f53dc30513ccbb30aec5cbe3657e7
diff --git a/src/com/android/settings/widget/SettingsMainSwitchPreference.java b/src/com/android/settings/widget/SettingsMainSwitchPreference.java
index 7f349bc..de7d692 100644
--- a/src/com/android/settings/widget/SettingsMainSwitchPreference.java
+++ b/src/com/android/settings/widget/SettingsMainSwitchPreference.java
@@ -84,7 +84,9 @@
mMainSwitchBar = (SettingsMainSwitchBar) holder.findViewById(R.id.main_switch_bar);
mMainSwitchBar.show();
- mEnforcedAdmin = mRestrictedHelper.checkRestrictionEnforced();
+ if (mRestrictedHelper != null) {
+ mEnforcedAdmin = mRestrictedHelper.checkRestrictionEnforced();
+ }
updateStatus(isChecked());
registerListenerToSwitchBar();