diff options
| author | Chad Brubaker <cbrubaker@google.com> | 2015-03-30 20:33:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-30 20:33:55 +0000 |
| commit | 021a1e090a98d6a8cbf05ec1a0d3f899a7b4598a (patch) | |
| tree | 7ae49ef4aeee36fded5e75d6a75249d7e857cfeb /core/java/android/security | |
| parent | b730035761c68ad82f6308f32f884cd4b7b8e1ca (diff) | |
| parent | 7081a16859cdcf32f565379a8179ddc7b50b3c1d (diff) | |
| download | frameworks_base-021a1e090a98d6a8cbf05ec1a0d3f899a7b4598a.zip frameworks_base-021a1e090a98d6a8cbf05ec1a0d3f899a7b4598a.tar.gz frameworks_base-021a1e090a98d6a8cbf05ec1a0d3f899a7b4598a.tar.bz2 | |
am 7081a168: am 5341d83c: am f603e286: Merge "Add authorization binder methods"
* commit '7081a16859cdcf32f565379a8179ddc7b50b3c1d':
Add authorization binder methods
Diffstat (limited to 'core/java/android/security')
| -rw-r--r-- | core/java/android/security/IKeystoreService.aidl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/security/IKeystoreService.aidl b/core/java/android/security/IKeystoreService.aidl index 14b5748..579cdbe 100644 --- a/core/java/android/security/IKeystoreService.aidl +++ b/core/java/android/security/IKeystoreService.aidl @@ -73,4 +73,6 @@ interface IKeystoreService { OperationResult update(IBinder token, in KeymasterArguments params, in byte[] input); OperationResult finish(IBinder token, in KeymasterArguments params, in byte[] signature); int abort(IBinder handle); + boolean isOperationAuthorized(IBinder token); + int addAuthToken(in byte[] authToken); } |