commit b362ae3d2fc8dd7c92c28322291814a6815dc1a1
author Chad Brubaker <cbrubaker@google.com> Thu Apr 16 22:24:50 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Apr 16 22:24:50 2015 +0000
tree 41c3c0dcb8cb00c5b5aa69e038babded52e222d1
parent a1581c4e1778b31d4fd8cfe9a1219b93d5276df2
parent bb9c9dbc4ae285c5fb7b9c2aed4bc45333cade35

am bb9c9dbc: am 9484bb01: Merge "Support KM_LONG_REP"

* commit 'bb9c9dbc4ae285c5fb7b9c2aed4bc45333cade35':
  Support KM_LONG_REP

keystore/IKeystoreService.cpp

diff --git a/keystore/IKeystoreService.cpp b/keystore/IKeystoreService.cpp
index d58f5ec..f920095 100644
--- a/keystore/IKeystoreService.cpp
+++ b/keystore/IKeystoreService.cpp
@@ -219,7 +219,8 @@
             out->writeInt32(param.integer);
             break;
         }
-        case KM_LONG: {
+        case KM_LONG:
+        case KM_LONG_REP: {
             out->writeInt32(param.tag);
             out->writeInt64(param.long_integer);
             break;
@@ -270,7 +271,8 @@
             *out = keymaster_param_int(tag, value);
             break;
         }
-        case KM_LONG: {
+        case KM_LONG:
+        case KM_LONG_REP: {
             uint64_t value = in.readInt64();
             *out = keymaster_param_long(tag, value);
             break;