Work on issue #5461497: Landed on Welcome screen after a tap on 'Next' in Screen 500

With the corresponding change for the activity manager to allow the home
activity to finish itself, this activity can now be a little less dirty
and just call finish() when it finds it is not needed.

Change-Id: I1a449c7bec9fba659e27a9e918f8a9b0c55b2098

1 files changed, 3 insertions, 7 deletions

diff --git a/src/com/android/settings/CryptKeeper.java b/src/com/android/settings/CryptKeeper.java
index d58dddb93..655d8ad26 100644
--- a/src/com/android/settings/CryptKeeper.java
+++ b/src/com/android/settings/CryptKeeper.java
@@ -224,17 +224,13 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
             pm.setComponentEnabledSetting(name, PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
                     PackageManager.DONT_KILL_APP);
             // Typically CryptKeeper is launched as the home app.  We didn't
-            // want to be running, so need to finish this activity and re-launch
-            // its intent now that we are not in the way of doing what is really
-            // supposed to happen.
+            // want to be running, so need to finish this activity.  We can count
+            // on the activity manager re-launching the new home app upon finishing
+            // this one, since this will leave the activity stack empty.
             // NOTE: This is really grungy.  I think it would be better for the
             // activity manager to explicitly launch the crypt keeper instead of
             // home in the situation where we need to decrypt the device
             finish();
-            Intent intent = getIntent();
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            intent.setComponent(null);
-            startActivity(intent);
             return;
         }