diff options
| author | Andres Morales <anmorales@google.com> | 2015-04-13 17:42:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-13 17:42:21 +0000 |
| commit | 28bfa10673ae0bef2b9500214510e2beb0d506fd (patch) | |
| tree | 9ece73e057e227558d546d017fde861b20fc729d | |
| parent | 87f0b385a188db1df285c0ce820b7e2ab43e1e1c (diff) | |
| parent | 38beb106f37034c32298f258e07cddf3ce377fcd (diff) | |
| download | android_system_security-28bfa10673ae0bef2b9500214510e2beb0d506fd.tar.gz android_system_security-28bfa10673ae0bef2b9500214510e2beb0d506fd.tar.bz2 android_system_security-28bfa10673ae0bef2b9500214510e2beb0d506fd.zip | |
am 38beb106: am a11517f6: am 00300a11: Merge "Fix addAuthToken api"
* commit '38beb106f37034c32298f258e07cddf3ce377fcd':
Fix addAuthToken api
| -rw-r--r-- | keystore/IKeystoreService.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/keystore/IKeystoreService.cpp b/keystore/IKeystoreService.cpp index 4969aca..855790e 100644 --- a/keystore/IKeystoreService.cpp +++ b/keystore/IKeystoreService.cpp @@ -1778,7 +1778,6 @@ status_t BnKeystoreService::onTransact( } case ADD_AUTH_TOKEN: { CHECK_INTERFACE(IKeystoreService, data, reply); - sp<IBinder> token = data.readStrongBinder(); const uint8_t* token_bytes = NULL; size_t size = 0; readByteArray(data, &token_bytes, &size); |