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

Fix the NPE in the ScreenPinningSettings

Browse Source 
- move mFooterPreference and others init before the SwitchBar

Fixes: 144407413
Test: manual test
Change-Id: I80d86942f35d16e0460c5fa48bb127932d2086a1
This commit is contained in:
Sunny Shao
2019-11-13 20:35:56 +08:00
parent 673b5393a7
commit 56b7acd49e
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/security/ScreenPinningSettings.java
View File

@@ -72,17 +72,16 @@ public class ScreenPinningSettings extends SettingsPreferenceFragment
activity.setTitle(R.string.screen_pinning_title); activity.setTitle(R.string.screen_pinning_title);
mLockPatternUtils = new LockPatternUtils(activity); 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 = activity.getSwitchBar();
mSwitchBar.addOnSwitchChangeListener(this); mSwitchBar.addOnSwitchChangeListener(this);
mSwitchBar.show(); mSwitchBar.show();
mSwitchBar.setChecked(isLockToAppEnabled(getActivity())); 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(); updateDisplay();
} }