Merge "fix npe in SecuritySettings"
This commit is contained in:
committed by
Android (Google) Code Review
commit
73fed2c477
@@ -234,8 +234,10 @@ public class SecuritySettings extends RestrictedSettingsFragment
|
|||||||
(PreferenceGroup) root.findPreference(KEY_SECURITY_CATEGORY);
|
(PreferenceGroup) root.findPreference(KEY_SECURITY_CATEGORY);
|
||||||
|
|
||||||
if (securityCategory != null) {
|
if (securityCategory != null) {
|
||||||
securityCategory.removePreference(
|
Preference preference = root.findPreference(KEY_NFC_UNLOCK_SET_OR_CHANGE);
|
||||||
root.findPreference(KEY_NFC_UNLOCK_SET_OR_CHANGE));
|
if (preference != null) {
|
||||||
|
securityCategory.removePreference(preference);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user