commit a64183887592f7deb0989390388f4259337df082
author TreeHugger Robot <treehugger-gerrit@google.com> Fri May 10 22:58:32 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 10 22:58:32 2019 +0000
tree 9d18b385b06ea1abd4b7a8a3ae079a237e14653c
parent b5f8645934e4671b8f439d0c21dd4727fdfbfad8
parent e49b0682bd7f7903c0d0eaca2a4a2696b2e98763

Merge "Add an intent for check lock activity" into pi-car-dev

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ee56b77..a91f8f3 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -271,6 +271,11 @@
         <activity android:name=".security.CheckLockActivity"
                   android:configChanges="orientation|keyboardHidden|screenSize"
                   android:windowSoftInputMode="adjustResize">
+            <intent-filter>
+                <action android:name="android.app.action.CONFIRM_DEVICE_CREDENTIAL" />
+                <action android:name="android.app.action.CONFIRM_FRP_CREDENTIAL" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
         </activity>
 
         <activity android:name=".system.ThirdPartyLicensesActivity"