commit 9103fbb8379d436462fe095ac195a22a08ec7a5e
author Adrian Roos <roosa@google.com> Wed Apr 27 22:52:56 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Apr 27 22:52:56 2016 +0000
tree 7b4f9e76ae42f5dd6c77d8839573522e51b979bd
parent e9f4fe7c4db589a022a886fe1c24c5098e9071e1
parent aee8d8c7e127cf35c0d579c3cbfc6204d6b3229f

Merge "Fix crash when recreating SecuritySubSettings" into nyc-dev
am: aee8d8c

* commit 'aee8d8c7e127cf35c0d579c3cbfc6204d6b3229f':
  Fix crash when recreating SecuritySubSettings

Change-Id: I677d0025a9dfbb6afe7ad340d1a6e57daab5ab98

src/com/android/settings/SecuritySettings.java

diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index b45a988..30c6ab4 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -1027,6 +1027,7 @@
             super.onCreate(icicle);
             mLockPatternUtils = new LockPatternUtils(getContext());
             mDPM = getContext().getSystemService(DevicePolicyManager.class);
+            createPreferenceHierarchy();
         }
 
         @Override