OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8cf68fc
3a01871
)
Merge changes I02a3c932,I04b6f64d
author
Kevin Chyn
<kchyn@google.com>
Tue, 9 Oct 2018 18:04:17 +0000
(18:04 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Tue, 9 Oct 2018 18:04:17 +0000
(18:04 +0000)
* changes:
Add protected BiometricPrompt API to allow default title
Add setActiveUser to BiometricManager/Service
1
2
core/java/android/hardware/biometrics/BiometricManager.java
patch
|
diff1
|
diff2
|
blob
|
history
core/res/res/values/strings.xml
patch
|
diff1
|
diff2
|
blob
|
history
core/res/res/values/symbols.xml
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/biometrics/BiometricService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/java/android/hardware/biometrics/BiometricManager.java
Simple merge
diff --cc
core/res/res/values/strings.xml
Simple merge
diff --cc
core/res/res/values/symbols.xml
Simple merge
diff --cc
services/core/java/com/android/server/biometrics/BiometricService.java
Simple merge
OSDN Git Service
