OSDN Git Service

Merge changes I9706478e,I3fe2dea3,Ic65566c0 into qt-dev
authorJoe Onorato <joeo@google.com>
Fri, 5 Apr 2019 21:29:24 +0000 (21:29 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 5 Apr 2019 21:29:24 +0000 (21:29 +0000)
commit1be371ddbd49524ec4127a6c01784981a467d45b
tree187eb0b2681df76de9b8a4bcd6bf6029a15ec92a
parentcf457b24595f0433cf3e815380568e47e0e5b392
parent9bd5db7a68b7e91d97d3b7b0dfc70a1dd45f9abb
Merge changes I9706478e,I3fe2dea3,Ic65566c0 into qt-dev

* changes:
  Make libplatformprotos-static, which is safe to use when you don't have shared libraries.
  Add additional system properties that can disable the face debugging codepath
  Fix mMaxOffset not initialized.
Android.bp
services/core/java/com/android/server/biometrics/face/FaceService.java