commit 00bb4c45da04c610f756b955ac7226834240163c
author Chad Brubaker <cbrubaker@google.com> Wed Sep 28 20:41:18 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Sep 28 20:41:18 2016 +0000
tree 80deb93ffba200cfdac2e5954ebdefdf89a8ad4d
parent f849ce1b4dae5fe489cf137c6f0a0e3815cec213
parent 178dca1c55c771c88652d28e10a2a032c28d6518

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

Change-Id: Iac585fe55cd27fa6111e3ee2eedcce5d40906851

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;