From 481b3abe0d9b645013d1a03645c4d651b71f15e4 Mon Sep 17 00:00:00 2001
From: Stanley Wang <stanleytfwang@google.com>
Date: Fri, 4 Jun 2021 16:15:04 +0800
Subject: [PATCH] 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
---
 .../android/settings/widget/SettingsMainSwitchPreference.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/widget/SettingsMainSwitchPreference.java b/src/com/android/settings/widget/SettingsMainSwitchPreference.java
index 7f349bc6846..de7d6926d03 100644
--- a/src/com/android/settings/widget/SettingsMainSwitchPreference.java
+++ b/src/com/android/settings/widget/SettingsMainSwitchPreference.java
@@ -84,7 +84,9 @@ public class SettingsMainSwitchPreference extends TwoStatePreference implements
 
         mMainSwitchBar = (SettingsMainSwitchBar) holder.findViewById(R.id.main_switch_bar);
         mMainSwitchBar.show();
-        mEnforcedAdmin = mRestrictedHelper.checkRestrictionEnforced();
+        if (mRestrictedHelper != null) {
+            mEnforcedAdmin = mRestrictedHelper.checkRestrictionEnforced();
+        }
         updateStatus(isChecked());
         registerListenerToSwitchBar();