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 am: 7e462377b9 am: 59e79bf772

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

Change-Id: Ibcf27a779aa02a3b085bfd5f52c4828c67a06c39
This commit is contained in:
Stanley Wang
2021-06-04 10:34:25 +00:00
committed by Automerger Merge Worker
parent 349375970a 59e79bf772
commit fe7987ff5d
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();