commit 5ab064f34300f9d7b7583394e5d686df437163e2
author Kevin Chyn <kchyn@google.com> Fri Apr 12 15:19:12 2019 -0700
committer Kevin Chyn <kchyn@google.com> Sat Apr 13 08:17:38 2019 +0000
tree 49784aa55370b598f7ce4348c56e1e7ccac73e30
parent c4083cecd7346efef58c6f04d9737b27e71de717

Launch correct enrollment activity from ChooseLock

Test: no noticable difference when setting up fingeprint work profile

Fixes: 130397083
Change-Id: I34be5262cc52052ce25a188f19bbcc13f938ac92

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index dfbc02c..76a8770 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1562,6 +1562,11 @@
             android:exported="false"
             android:screenOrientation="portrait"/>
 
+        <!-- Must not be exported -->
+        <activity android:name=".biometrics.BiometricEnrollActivity$InternalActivity"
+            android:exported="false"
+            android:theme="@style/GlifTheme.Light"/>
+
         <activity android:name=".biometrics.BiometricEnrollActivity"
             android:exported="true"
             android:theme="@style/GlifTheme.Light">