commit 0ebf13dbf975028735a8afc42e39c6ea47cec704
author Shawn Willden <swillden@google.com> Wed Jun 24 16:29:45 2015 -0700
committer Shawn Willden <swillden@google.com> Wed Jun 24 16:29:45 2015 -0700
tree c80aee34277ca884cd26aff93a50cc00ad4e140c
parent b913aa5774c96fae83afe3dd1935394f0edcaaa9

Rename keymaster tag types to clarify that integers are unsigned.

Bug: 22008538
Change-Id: Id6e3ca5c1defc8149b7ae7de5787b3635e2a4262

keystore/IKeystoreService.cpp

diff --git a/keystore/IKeystoreService.cpp b/keystore/IKeystoreService.cpp
index 519b78c..8ed09c4 100644
--- a/keystore/IKeystoreService.cpp
+++ b/keystore/IKeystoreService.cpp
@@ -216,14 +216,14 @@
             out->writeInt32(param.enumerated);
             break;
         }
-        case KM_INT:
-        case KM_INT_REP: {
+        case KM_UINT:
+        case KM_UINT_REP: {
             out->writeInt32(param.tag);
             out->writeInt32(param.integer);
             break;
         }
-        case KM_LONG:
-        case KM_LONG_REP: {
+        case KM_ULONG:
+        case KM_ULONG_REP: {
             out->writeInt32(param.tag);
             out->writeInt64(param.long_integer);
             break;
@@ -268,14 +268,14 @@
             *out = keymaster_param_enum(tag, value);
             break;
         }
-        case KM_INT:
-        case KM_INT_REP: {
+        case KM_UINT:
+        case KM_UINT_REP: {
             uint32_t value = in.readInt32();
             *out = keymaster_param_int(tag, value);
             break;
         }
-        case KM_LONG:
-        case KM_LONG_REP: {
+        case KM_ULONG:
+        case KM_ULONG_REP: {
             uint64_t value = in.readInt64();
             *out = keymaster_param_long(tag, value);
             break;