Commit 44298642 authored Nov 30, 2020 by Louis Chang Committed by Automerger Merge Worker Nov 30, 2020

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

Merge "Revert "Keystore SPI: Initialize KeymasterDefs contants with AIDL generated enums"" am: 9233cb2b am: 2399198f am: bb1d23d0

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

Change-Id: Ic0aaef95b8a9dd09161ed346982c8b3947418f96

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

+167 −258

File changed.

Preview size limit exceeded, changes collapsed.