From 686ae494f485a5025dfa456b4f32427b3715c337 Mon Sep 17 00:00:00 2001
From: Udam Saini <udam@google.com>
Date: Tue, 2 Feb 2016 17:02:29 -0800
Subject: [PATCH] Start redaction activity after we finish current activity.

This is needed so that activity manager won't start a new task stack.
During setup, we want everything on the same task stack to allow
task locking.

Change-Id: Iaa1e13da8251ad37362ea41b374300268b6e9875
---
 src/com/android/settings/ChooseLockPassword.java | 2 +-
 src/com/android/settings/ChooseLockPattern.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/ChooseLockPassword.java b/src/com/android/settings/ChooseLockPassword.java
index 874a3f7322d..2a8de8b242b 100644
--- a/src/com/android/settings/ChooseLockPassword.java
+++ b/src/com/android/settings/ChooseLockPassword.java
@@ -669,7 +669,6 @@ public class ChooseLockPassword extends SettingsActivity {
         @Override
         public void onChosenLockSaveFinished(boolean wasSecureBefore, Intent resultData) {
             getActivity().setResult(RESULT_FINISHED, resultData);
-            getActivity().finish();
 
             if (!wasSecureBefore) {
                 Intent intent = getRedactionInterstitialIntent(getActivity());
@@ -677,6 +676,7 @@ public class ChooseLockPassword extends SettingsActivity {
                     startActivity(intent);
                 }
             }
+            getActivity().finish();
         }
     }
 
diff --git a/src/com/android/settings/ChooseLockPattern.java b/src/com/android/settings/ChooseLockPattern.java
index 255cf9d53ad..185e48996f6 100644
--- a/src/com/android/settings/ChooseLockPattern.java
+++ b/src/com/android/settings/ChooseLockPattern.java
@@ -670,7 +670,6 @@ public class ChooseLockPattern extends SettingsActivity {
         @Override
         public void onChosenLockSaveFinished(boolean wasSecureBefore, Intent resultData) {
             getActivity().setResult(RESULT_FINISHED, resultData);
-            getActivity().finish();
 
             if (!wasSecureBefore) {
                 Intent intent = getRedactionInterstitialIntent(getActivity());
@@ -678,6 +677,7 @@ public class ChooseLockPattern extends SettingsActivity {
                     startActivity(intent);
                 }
             }
+            getActivity().finish();
         }
     }