commit 178dca1c55c771c88652d28e10a2a032c28d6518
author Chad Brubaker <cbrubaker@google.com> Wed Sep 28 20:32:01 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Sep 28 20:32:01 2016 +0000
tree b75bd1bba188a56f1c45275c49126585a32f5b78
parent 72ab1f08c14f3d4bd312cc311d91e60ef6a9ed8a
parent eb44d8146b8d1123699f75498b802ff7cac0f54f

Merge "keystore: use static_cast for conversion between void* and uinti8_t*" am: e260a43a7e am: 0b7e649235
am: eb44d8146b

Change-Id: I1abb3aeb1f19705ffd5448a78d82878b0df565ec

keystore/IKeystoreService.cpp

diff --git a/keystore/IKeystoreService.cpp b/keystore/IKeystoreService.cpp
index 5cfee80..9217fae 100644
--- a/keystore/IKeystoreService.cpp
+++ b/keystore/IKeystoreService.cpp
@@ -235,7 +235,7 @@
         return false;
     }
 
-    blob->data = reinterpret_cast<const uint8_t*>(malloc(length));
+    blob->data = static_cast<const uint8_t*>(malloc(length));
     if (!blob->data)
         return false;