diff options
| author | Shawn Willden <swillden@google.com> | 2015-06-24 16:29:45 -0700 |
|---|---|---|
| committer | Shawn Willden <swillden@google.com> | 2015-06-24 16:29:45 -0700 |
| commit | 0ebf13dbf975028735a8afc42e39c6ea47cec704 (patch) | |
| tree | c80aee34277ca884cd26aff93a50cc00ad4e140c | |
| parent | b913aa5774c96fae83afe3dd1935394f0edcaaa9 (diff) | |
| download | android_system_security-0ebf13dbf975028735a8afc42e39c6ea47cec704.tar.gz android_system_security-0ebf13dbf975028735a8afc42e39c6ea47cec704.tar.bz2 android_system_security-0ebf13dbf975028735a8afc42e39c6ea47cec704.zip | |
Rename keymaster tag types to clarify that integers are unsigned.
Bug: 22008538
Change-Id: Id6e3ca5c1defc8149b7ae7de5787b3635e2a4262
| -rw-r--r-- | keystore/IKeystoreService.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
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 @@ void writeKeymasterArgumentToParcel(const keymaster_key_param_t& param, Parcel* 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 @@ bool readKeymasterArgumentFromParcel(const Parcel& in, keymaster_key_param_t* ou *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; |