Merge "Integrate IKeystoreUserManager aidl with LockSettingsService." am: bfc1f6b382 am: 7fa15840a8 am: 55cd97f94c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1578423 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia73cdbf546322a3579e384cc61e2076483d068df
2021-02-20 12:25:30 +00:00
parent 9801436e7f 55cd97f94c
commit 657ec5c846
4 changed files with 111 additions and 14 deletions
--- a/Android.bp
+++ b/Android.bp
@@ -544,6 +544,7 @@ java_library {
        "android.hardware.vibrator-V1.3-java",
        "android.security.apc-java",
        "android.security.authorization-java",
+        "android.security.usermanager-java",
        "android.system.keystore2-V1-java",
        "android.system.suspend.control.internal-java",
        "cameraprotosnano",