Merge "Launch correct enrollment activity from ChooseLock" into qt-dev am: 79f49b4626

am: 9433c38eb6 Change-Id: Ib4e72b79dfd4b987067405bb1be2bf936a4d8fb1
2019-04-13 21:16:31 -07:00
parent cb665368d4 9433c38eb6
commit a9a2578768
6 changed files with 61 additions and 17 deletions
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1560,6 +1560,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">