summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorBrian Young <bcyoung@google.com>2018-02-23 18:04:20 +0000
committerBrian C. Young <bcyoung@google.com>2018-03-29 10:24:18 -0700
commit9272dab49efa9c70ab92879c3e79a76fc8364d34 (patch)
tree9155709e2901fd9e5fe2a9ff2608765d87ce9b02 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent36716eb4709503f2ef370c6f67273440cd91d18c (diff)
Restore "Add "Unlocked device required" parameter to keys"
Add a keymaster parameter for keys that should be inaccessible when the device screen is locked. "Locked" here is a state where the device can be used or accessed without any further trust factor such as a PIN, password, fingerprint, or trusted face or voice. This parameter is added to the Java keystore interface for key creation and import, as well as enums specified by and for the native keystore process. This reverts commit da82e2cb7193032867f86b996467bcd117545616. Test: CTS tests in I8a5affd1eaed176756175158e3057e44934fffed Bug: 67752510 Merged-In: Ia162f1db81d050f64995d0360f714e79033ea8a5 Change-Id: Ia162f1db81d050f64995d0360f714e79033ea8a5 (cherry picked from d7c961ee914192e09ec10727da6d31a6b597bf51)
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions