commit d5bb245f997f7cd3d359cee015bb223c7ad0cd25
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Nov 13 14:15:04 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 13 14:15:04 2019 +0000
tree 33b9314f10bb961bf4b26fa08afe1db94b5a404c
parent 48d472583a607d68b6e92ab00430b3694f1d3ba2
parent 56b7acd49ebc1d6f3ecf9c49bb7036afafc7c24e

Merge "Fix the NPE in the ScreenPinningSettings"

src/com/android/settings/security/ScreenPinningSettings.java

diff --git a/src/com/android/settings/security/ScreenPinningSettings.java b/src/com/android/settings/security/ScreenPinningSettings.java
index aa3e862..6b16a5d 100644
--- a/src/com/android/settings/security/ScreenPinningSettings.java
+++ b/src/com/android/settings/security/ScreenPinningSettings.java
@@ -72,17 +72,16 @@
         activity.setTitle(R.string.screen_pinning_title);
         mLockPatternUtils = new LockPatternUtils(activity);
 
+        addPreferencesFromResource(R.xml.screen_pinning_settings);
+        final PreferenceScreen root = getPreferenceScreen();
+        mUseScreenLock = root.findPreference(KEY_USE_SCREEN_LOCK);
+        mFooterPreference = root.findPreference(KEY_FOOTER);
 
         mSwitchBar = activity.getSwitchBar();
         mSwitchBar.addOnSwitchChangeListener(this);
         mSwitchBar.show();
         mSwitchBar.setChecked(isLockToAppEnabled(getActivity()));
 
-        addPreferencesFromResource(R.xml.screen_pinning_settings);
-
-        final PreferenceScreen root = getPreferenceScreen();
-        mUseScreenLock = root.findPreference(KEY_USE_SCREEN_LOCK);
-        mFooterPreference = root.findPreference(KEY_FOOTER);
         updateDisplay();
     }