OSDN Git Service

Merge changes from topic "biometrics-face"
authorTreeHugger Robot <treehugger-gerrit@google.com>
Fri, 22 Jun 2018 18:44:27 +0000 (18:44 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 22 Jun 2018 18:44:27 +0000 (18:44 +0000)
commitabe78cd313875032a3411a79dc9b687098fc1db6
tree32d546f69f02ad47aed4c0ad95ed5b794c4aee33
parent1d4883110664ebb42c915e636b9721b4c220d4a9
parent2ffadb38bc76a46c38fd64057ab7afa559a3f9a4
Merge changes from topic "biometrics-face"

* changes:
  5/n: Move FaceService to biometrics directory
  4/n: Add face authentication framework
13 files changed:
Android.bp
core/java/android/app/AppOpsManager.java
core/java/android/app/SystemServiceRegistry.java
core/java/android/app/admin/DevicePolicyManager.java
core/java/android/app/admin/IDevicePolicyManager.aidl
core/res/AndroidManifest.xml
core/res/res/values/strings.xml
core/res/res/values/symbols.xml
packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
services/java/com/android/server/SystemServer.java