Merge "Fix crash when recreating SecuritySubSettings" into nyc-dev

am: aee8d8c

* commit 'aee8d8c7e127cf35c0d579c3cbfc6204d6b3229f':
  Fix crash when recreating SecuritySubSettings

Change-Id: I09565a64acedc59c0e83b63d5d0974ba133ede87
This commit is contained in:
Adrian Roos
2016-04-27 23:45:11 +00:00
committed by android-build-merger

View File

@@ -1027,6 +1027,7 @@ public class SecuritySettings extends SettingsPreferenceFragment
super.onCreate(icicle);
mLockPatternUtils = new LockPatternUtils(getContext());
mDPM = getContext().getSystemService(DevicePolicyManager.class);
createPreferenceHierarchy();
}
@Override