From 59f5976e15699df713369564c92cda3941f74dce Mon Sep 17 00:00:00 2001
From: Andres Morales <anmorales@google.com>
Date: Thu, 16 Apr 2015 16:30:31 -0700
Subject: [PATCH] Unbreak CC screen

Re-add logic in authenticationSucceeded

Change-Id: Iac1925f5e2f2f67dd5d7c7f5d454f32691d51b61
---
 .../settings/ConfirmDeviceCredentialBaseFragment.java       | 4 ++--
 src/com/android/settings/ConfirmLockPassword.java           | 6 ++++--
 src/com/android/settings/ConfirmLockPattern.java            | 6 ++++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java b/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
index f9908b0f64e..fc8edf8e882 100644
--- a/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
+++ b/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
@@ -90,11 +90,11 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends InstrumentedFr
     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) {
diff --git a/src/com/android/settings/ConfirmLockPassword.java b/src/com/android/settings/ConfirmLockPassword.java
index 975882f7816..bec3a45a293 100644
--- a/src/com/android/settings/ConfirmLockPassword.java
+++ b/src/com/android/settings/ConfirmLockPassword.java
@@ -169,8 +169,10 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
         }
 
         @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() {
diff --git a/src/com/android/settings/ConfirmLockPattern.java b/src/com/android/settings/ConfirmLockPattern.java
index 0b2bec3da8d..420a7f8d0ba 100644
--- a/src/com/android/settings/ConfirmLockPattern.java
+++ b/src/com/android/settings/ConfirmLockPattern.java
@@ -232,8 +232,10 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
         }
 
         @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