Merge "cameraserver: Use String8/String16 constructor conversions." into main am: b96354fc67 am: 5c150360b0 am: 98a0fb883d am: 1a9959f642 am: 996b6d7bcc
Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2729335
Change-Id: I311874cb165e98d8a3c633025e652e49eeca9814
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/camera/include/camera/StringUtils.h b/camera/include/camera/StringUtils.h
index 547750f..80c419f 100644
--- a/camera/include/camera/StringUtils.h
+++ b/camera/include/camera/StringUtils.h
@@ -17,8 +17,6 @@
#ifndef ANDROID_SERVERS_CAMERA_STRINGUTILS_H
#define ANDROID_SERVERS_CAMERA_STRINGUTILS_H
-#include <codecvt>
-#include <locale>
#include <memory>
#include <optional>
#include <string>
@@ -65,8 +63,8 @@
}
inline std::string toStdString(const String16 &str) {
- std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t> convert;
- return convert.to_bytes(str.c_str());
+ String8 str8(str);
+ return std::string(str8.c_str());
}
/**
@@ -74,8 +72,9 @@
* len is the number of characters.
*/
inline std::string toStdString(const char16_t *str, size_t len) {
- std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t> convert;
- return convert.to_bytes(str, str + len);
+ String16 str16(str, len);
+ String8 str8(str16);
+ return std::string(str8.c_str());
}
} // namespace android