Skip to content
Commit 53c5d870 authored by Kevin Chyn's avatar Kevin Chyn Committed by Android (Google) Code Review
Browse files

Merge changes Ic26e47c1,I6c9717d1 

* changes:
  Check foreground and appOps for BiometricPrompt#authenticate
  Update authentication when encrypted or lockout
parents fe5fd515 613ee92b
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment