Commit 84839730 authored Dec 01, 2020 by Treehugger Robot Committed by Automerger Merge Worker Dec 01, 2020

Merge "Revert "Revert "Keystore SPI: Initialize KeymasterDefs contants with...

Merge "Revert "Revert "Keystore SPI: Initialize KeymasterDefs contants with AIDL generated enums""" am: c565f2bd am: 563c167f am: f1d47c7b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512902

Change-Id: Iaae86ff91e2faee4340a37ec34fd76798247f8d4

core/java/android/security/keymaster/KeymasterDefs.java

+258 −167

File changed.

Preview size limit exceeded, changes collapsed.