diff options
| author | Dmitry Dementyev <dementyev@google.com> | 2017-10-27 23:10:28 -0700 |
|---|---|---|
| committer | Dmitry Dementyev <dementyev@google.com> | 2017-11-07 10:21:08 -0800 |
| commit | efc4311a3fb84cacc98f0afe669c69f9d5196bd3 (patch) | |
| tree | 7084786efb494627bfb7446704e49072a62d8b13 /core/java | |
| parent | 843f07e2d31e64b57357bbfc106b5c3a28315332 (diff) | |
Get rid of manually created IKeystoreService.
Java/aidl side changes necessary to generate IKeystoreService.cpp
Generated C++ service currently doesn't support null parameters, so lots
of parameters were updated to pass default value instead of null.
Test: cts-tradefed run cts -m CtsKeystoreTestCases
Bug: 68389643
Change-Id: Ifaf2ab48b2bcd7b081e4b336aa279fa8ba4fbbbf
Diffstat (limited to 'core/java')
8 files changed, 12 insertions, 7 deletions
diff --git a/core/java/Android.bp b/core/java/Android.bp index 42b0f6bad0ae..1503445a1b02 100644 --- a/core/java/Android.bp +++ b/core/java/Android.bp @@ -2,3 +2,8 @@ filegroup { name: "IKeyAttestationApplicationIdProvider.aidl", srcs: ["android/security/keymaster/IKeyAttestationApplicationIdProvider.aidl"], } + +filegroup { + name: "IKeystoreService.aidl", + srcs: ["android/security/IKeystoreService.aidl"], +} diff --git a/core/java/android/security/KeystoreArguments.aidl b/core/java/android/security/KeystoreArguments.aidl index d636414a05e3..dc8ed50182ed 100644 --- a/core/java/android/security/KeystoreArguments.aidl +++ b/core/java/android/security/KeystoreArguments.aidl @@ -17,4 +17,4 @@ package android.security; /* @hide */ -parcelable KeystoreArguments; +parcelable KeystoreArguments cpp_header "keystore/KeystoreArguments.h"; diff --git a/core/java/android/security/keymaster/ExportResult.aidl b/core/java/android/security/keymaster/ExportResult.aidl index 4d9b2de6632f..17486531a3f0 100644 --- a/core/java/android/security/keymaster/ExportResult.aidl +++ b/core/java/android/security/keymaster/ExportResult.aidl @@ -17,4 +17,4 @@ package android.security.keymaster; /* @hide */ -parcelable ExportResult; +parcelable ExportResult cpp_header "keystore/ExportResult.h"; diff --git a/core/java/android/security/keymaster/KeyCharacteristics.aidl b/core/java/android/security/keymaster/KeyCharacteristics.aidl index be739d3223ab..32e75ad267b2 100644 --- a/core/java/android/security/keymaster/KeyCharacteristics.aidl +++ b/core/java/android/security/keymaster/KeyCharacteristics.aidl @@ -17,4 +17,4 @@ package android.security.keymaster; /* @hide */ -parcelable KeyCharacteristics; +parcelable KeyCharacteristics cpp_header "keystore/KeyCharacteristics.h"; diff --git a/core/java/android/security/keymaster/KeymasterArguments.aidl b/core/java/android/security/keymaster/KeymasterArguments.aidl index 1a73206512e9..44d9f0954781 100644 --- a/core/java/android/security/keymaster/KeymasterArguments.aidl +++ b/core/java/android/security/keymaster/KeymasterArguments.aidl @@ -17,4 +17,4 @@ package android.security.keymaster; /* @hide */ -parcelable KeymasterArguments; +parcelable KeymasterArguments cpp_header "keystore/KeymasterArguments.h"; diff --git a/core/java/android/security/keymaster/KeymasterBlob.aidl b/core/java/android/security/keymaster/KeymasterBlob.aidl index b7cd1c900efb..5c5db9ec314b 100644 --- a/core/java/android/security/keymaster/KeymasterBlob.aidl +++ b/core/java/android/security/keymaster/KeymasterBlob.aidl @@ -17,4 +17,4 @@ package android.security.keymaster; /* @hide */ -parcelable KeymasterBlob; +parcelable KeymasterBlob cpp_header "keystore/KeymasterBlob.h"; diff --git a/core/java/android/security/keymaster/KeymasterCertificateChain.aidl b/core/java/android/security/keymaster/KeymasterCertificateChain.aidl index dc1876aaaebd..ddb5cae1a254 100644 --- a/core/java/android/security/keymaster/KeymasterCertificateChain.aidl +++ b/core/java/android/security/keymaster/KeymasterCertificateChain.aidl @@ -17,4 +17,4 @@ package android.security.keymaster; /* @hide */ -parcelable KeymasterCertificateChain; +parcelable KeymasterCertificateChain cpp_header "keystore/KeymasterCertificateChain.h"; diff --git a/core/java/android/security/keymaster/OperationResult.aidl b/core/java/android/security/keymaster/OperationResult.aidl index ed26c8dd404b..db689d46521a 100644 --- a/core/java/android/security/keymaster/OperationResult.aidl +++ b/core/java/android/security/keymaster/OperationResult.aidl @@ -17,4 +17,4 @@ package android.security.keymaster; /* @hide */ -parcelable OperationResult; +parcelable OperationResult cpp_header "keystore/OperationResult.h"; |