commit 74a2283d2425107f7b39a29d8db7947d8c6f8c7c
author Jorim Jaggi <jjaggi@google.com> Thu Sep 10 20:12:19 2015 -0700
committer Jorim Jaggi <jjaggi@google.com> Thu Sep 10 20:14:06 2015 -0700
tree ab3bbe7cbb491aa685f21d82cb63f7eb630195f7
parent 69671dafc8b950c71f2ed303a145feb6f4d4fba8

Finish trampoline activity for ConfirmDeviceCredential immediately

Make sure to finish ConfirmDeviceCredentialActivity directly, and use
Intent.FLAG_ACTIVITY_FORWARD_RESULT, so we can't even end up in a
state where we have the trampoline activity but not the real activity.

Bug: 23849216
Change-Id: I7a5be5af74ca85c11df1f61a69c3fd5cf558e1fb

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f199673..c0e1db8 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1409,7 +1409,7 @@
         <!-- Lock screen settings -->
         <activity android:name="ConfirmDeviceCredentialActivity"
             android:exported="true"
-            android:theme="@style/Transparent">
+            android:theme="@android:style/Theme.NoDisplay">
             <intent-filter android:priority="1">
                 <action android:name="android.app.action.CONFIRM_DEVICE_CREDENTIAL" />
                 <category android:name="android.intent.category.DEFAULT" />