Merge "Unbreak CC screen"

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) {

src/com/android/settings/ConfirmLockPassword.java

@@ -169,8 +169,10 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
         }
 
         @Override
-        protected void authenticationSucceeded(@Nullable String password) {
+        protected void authenticationSucceeded() {
-            // TODO: make this play nice with challenge
+            Intent intent = new Intent();
+            getActivity().setResult(RESULT_OK, intent);
+            getActivity().finish();
         }
 
         private void handleNext() {

src/com/android/settings/ConfirmLockPattern.java

@@ -232,8 +232,10 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
         }
 
         @Override
-        protected void authenticationSucceeded(@Nullable String password) {
+        protected void authenticationSucceeded() {
-            // TODO: make this play nice with challenge
+            Intent intent = new Intent();
+            getActivity().setResult(Activity.RESULT_OK, intent);
+            getActivity().finish();
         }
 
         @Override