PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix NPE in SettingsMainSwitchPreference." into sc-dev am: d9aa0b070f

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

Change-Id: Ic1eb86fc571e27b0f26714db4d419dd5751e51c1
This commit is contained in:
Stanley Wang
2021-06-04 10:10:11 +00:00
committed by Automerger Merge Worker
parent 6ad33a5d97 d9aa0b070f
commit 7e462377b9
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/widget/SettingsMainSwitchPreference.java
View File

@@ -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();