commit d9aa0b070f071b91e0b5c9f2e72a75cedf4aa691
author Stanley Wang <stanleytfwang@google.com> Fri Jun 04 10:06:32 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 04 10:06:32 2021 +0000
tree 26b94d4879e275a228d8b64d69fd7fb18b8cab2b
parent 7f13b83ef1532c79c9ddf632a0887498a55f3a1a
parent 481b3abe0d9b645013d1a03645c4d651b71f15e4

Merge "Fix NPE in SettingsMainSwitchPreference." into sc-dev

src/com/android/settings/widget/SettingsMainSwitchPreference.java

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