commit 31ce86d3bd69a2c7e7bdfec3cf9317d53f7ec1df
author John Spurlock <jspurlock@google.com> Thu May 16 15:36:26 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 16 15:36:27 2013 +0000
tree bd731f70dd8a4b9c7fd359f7baa60802c1408cb7
parent e5fc407146c3f09e3bcd55d907fdffe2d26f3c6d
parent 55dbdf68f966d5218a265086f848f60d5a75c13f

Merge "Hide notification listeners setting if no listeners." into jb-mr2-dev

src/com/android/settings/ChooseLockPassword.java

diff --git a/src/com/android/settings/ChooseLockPassword.java b/src/com/android/settings/ChooseLockPassword.java
index aab4ba6..b16f3f6 100644
--- a/src/com/android/settings/ChooseLockPassword.java
+++ b/src/com/android/settings/ChooseLockPassword.java
@@ -395,6 +395,7 @@
                             LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, false);
                     mLockPatternUtils.clearLock(isFallback);
                     mLockPatternUtils.saveLockPassword(pin, mRequestedQuality, isFallback);
+                    getActivity().setResult(RESULT_FINISHED);
                     getActivity().finish();
                 } else {
                     CharSequence tmp = mPasswordEntry.getText();