summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Joe Bolinger <jbolinger@google.com> 2022-03-01 23:25:55 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2022-03-01 23:25:55 +0000
commit532df4fc033bbd10b1d444cec3bd666db9eac832 (patch)
treeb54c083cf50d94d932c73678240a7e5a5d58fdc6 /libs/androidfw/StringPool.cpp
parentf464d627a2127918749f50341cbcf7f4258f93f8 (diff)
parent2effe9b44a5c7af426f4cac8443a6a8152592c75 (diff)
Merge changes from topic "coex-again-2" into tm-dev
* changes: Temporarily disable some biometric prompt tests. Add Face and Fingerprint (Co-Ex) support to biometric prompt. Remove face to fingerprint multi-sensor behavior. Remove duplicated UDFPS view into single fingerprint view.
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions