Merge "Fix NPE in SettingsMainSwitchPreference." into sc-dev
This commit is contained in:
@@ -84,7 +84,9 @@ public class SettingsMainSwitchPreference extends TwoStatePreference implements
|
|||||||
|
|
||||||
mMainSwitchBar = (SettingsMainSwitchBar) holder.findViewById(R.id.main_switch_bar);
|
mMainSwitchBar = (SettingsMainSwitchBar) holder.findViewById(R.id.main_switch_bar);
|
||||||
mMainSwitchBar.show();
|
mMainSwitchBar.show();
|
||||||
|
if (mRestrictedHelper != null) {
|
||||||
mEnforcedAdmin = mRestrictedHelper.checkRestrictionEnforced();
|
mEnforcedAdmin = mRestrictedHelper.checkRestrictionEnforced();
|
||||||
|
}
|
||||||
updateStatus(isChecked());
|
updateStatus(isChecked());
|
||||||
registerListenerToSwitchBar();
|
registerListenerToSwitchBar();
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user