commit 59f5976e15699df713369564c92cda3941f74dce
author Andres Morales <anmorales@google.com> Thu Apr 16 16:30:31 2015 -0700
committer Andres Morales <anmorales@google.com> Thu Apr 16 16:45:26 2015 -0700
tree 3140f19e2f5d0b46dd92459db7967efda6795956
parent a928ff4a67756341a972569a1029c0e981c9bb8d

Unbreak CC screen

Re-add logic in authenticationSucceeded

Change-Id: Iac1925f5e2f2f67dd5d7c7f5d454f32691d51b61

src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java

diff --git a/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java b/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
index f9908b0..fc8edf8 100644
--- a/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
+++ b/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
@@ -90,11 +90,11 @@
     public void onAuthenticated() {
         // Check whether we are still active.
         if (getActivity() != null && getActivity().isResumed()) {
-            authenticationSucceeded(null /* password */);
+            authenticationSucceeded();
         }
     }
 
-    protected abstract void authenticationSucceeded(@Nullable String password);
+    protected abstract void authenticationSucceeded();
 
     @Override
     public void onFingerprintIconVisibilityChanged(boolean visible) {

src/com/android/settings/ConfirmLockPassword.java

diff --git a/src/com/android/settings/ConfirmLockPassword.java b/src/com/android/settings/ConfirmLockPassword.java
index 975882f..bec3a45 100644
--- a/src/com/android/settings/ConfirmLockPassword.java
+++ b/src/com/android/settings/ConfirmLockPassword.java
@@ -169,8 +169,10 @@
         }
 
         @Override
-        protected void authenticationSucceeded(@Nullable String password) {
-            // TODO: make this play nice with challenge
+        protected void authenticationSucceeded() {
+            Intent intent = new Intent();
+            getActivity().setResult(RESULT_OK, intent);
+            getActivity().finish();
         }
 
         private void handleNext() {

src/com/android/settings/ConfirmLockPattern.java

diff --git a/src/com/android/settings/ConfirmLockPattern.java b/src/com/android/settings/ConfirmLockPattern.java
index 0b2bec3..420a7f8 100644
--- a/src/com/android/settings/ConfirmLockPattern.java
+++ b/src/com/android/settings/ConfirmLockPattern.java
@@ -232,8 +232,10 @@
         }
 
         @Override
-        protected void authenticationSucceeded(@Nullable String password) {
-            // TODO: make this play nice with challenge
+        protected void authenticationSucceeded() {
+            Intent intent = new Intent();
+            getActivity().setResult(Activity.RESULT_OK, intent);
+            getActivity().finish();
         }
 
         @Override