summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Randolph <randolphs@google.com>2017-04-06 20:10:02 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-04-06 20:10:02 +0000
commit079a2101c6a336aedf2f1cf592993586b3200241 (patch)
tree7181f0c5addc841aba59377ea190068d52137085
parenta2ed9fcf9cc4bcb4f607a44580a75f84c85c7fa3 (diff)
parent1baabfd09eee80290d7987b8e1a811b9c9956bad (diff)
downloadinterfaces-079a2101c6a336aedf2f1cf592993586b3200241.tar.gz
Use explicit .c_str() for hidl_string am: c620a935eb
am: 1baabfd09e Change-Id: I83919d5245aae0e4b07806e84eafc8160a41b68a
-rw-r--r--wifi/keystore/1.0/default/keystore.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/wifi/keystore/1.0/default/keystore.cpp b/wifi/keystore/1.0/default/keystore.cpp
index 7288f75..15ee64d 100644
--- a/wifi/keystore/1.0/default/keystore.cpp
+++ b/wifi/keystore/1.0/default/keystore.cpp
@@ -22,7 +22,7 @@ Return<void> Keystore::getBlob(const hidl_string& key, getBlob_cb _hidl_cb) {
}
hidl_vec<uint8_t> value;
// Retrieve the blob as wifi user.
- auto ret = service->get(String16(key), AID_WIFI, &value);
+ auto ret = service->get(String16(key.c_str()), AID_WIFI, &value);
if (!ret.isOk()) {
_hidl_cb(KeystoreStatusCode::ERROR_UNKNOWN, {});
return Void();
@@ -41,7 +41,7 @@ Return<void> Keystore::getPublicKey(
return Void();
}
hidl_vec<uint8_t> pubkey;
- auto ret = service->get_pubkey(String16(keyId), &pubkey);
+ auto ret = service->get_pubkey(String16(keyId.c_str()), &pubkey);
if (!ret.isOk()) {
_hidl_cb(KeystoreStatusCode::ERROR_UNKNOWN, {});
return Void();
@@ -61,7 +61,7 @@ Return<void> Keystore::sign(
return Void();
}
hidl_vec<uint8_t> signedData;
- auto ret = service->sign(String16(keyId), dataToSign, &signedData);
+ auto ret = service->sign(String16(keyId.c_str()), dataToSign, &signedData);
if (!ret.isOk()) {
_hidl_cb(KeystoreStatusCode::ERROR_UNKNOWN, {});
return Void();