commit 36cc145bd7e05b14f923c4ebe2935ba7eef4dbc7
author Shawn Willden <swillden@google.com> Wed Jun 24 23:59:34 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jun 24 23:59:34 2015 +0000
tree c80aee34277ca884cd26aff93a50cc00ad4e140c
parent c71e6f0d5b0bb1812f6ec88ccc04c842991661c4
parent 0ebf13dbf975028735a8afc42e39c6ea47cec704

am 0ebf13db: Rename keymaster tag types to clarify that integers are unsigned.

* commit '0ebf13dbf975028735a8afc42e39c6ea47cec704':
  Rename keymaster tag types to clarify that integers are unsigned.

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;