OSDN Git Service

Merge "Handle cancellation properly for setDeviceCredentialAllowed(true)" into qt-dev
authorKevin Chyn <kchyn@google.com>
Wed, 10 Apr 2019 08:34:34 +0000 (08:34 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 10 Apr 2019 08:34:34 +0000 (08:34 +0000)
commit76d5454a863740acb04f29f3b07f52e512154134
tree18d488abca11cbb87ec5a69c2478579fbfad767a
parent4777281cf4613a0aea4854d634c1bbfcc8cd8548
parent5a90a653f5613fb5ef84c760ee35fc64710559a3
Merge "Handle cancellation properly for setDeviceCredentialAllowed(true)" into qt-dev
Android.bp
services/core/java/com/android/server/biometrics/BiometricService.java