add DeviceInfo
This reverts commit 096895550b9d5430d7a001d491566decf4f9791b.
Change-Id: Ib2ed1e96d8f7f88302f5e27fe735687194553104
diff --git a/libs/hwui/utils/StringUtils.cpp b/libs/hwui/utils/StringUtils.cpp
index a1df0e7..64a5970 100644
--- a/libs/hwui/utils/StringUtils.cpp
+++ b/libs/hwui/utils/StringUtils.cpp
@@ -19,21 +19,19 @@
namespace android {
namespace uirenderer {
-StringCollection::StringCollection(const char* spacedList) {
+unordered_string_set StringUtils::split(const char* spacedList) {
+ unordered_string_set set;
const char* current = spacedList;
const char* head = current;
do {
head = strchr(current, ' ');
std::string s(current, head ? head - current : strlen(current));
if (s.length()) {
- mSet.insert(s);
+ set.insert(std::move(s));
}
current = head + 1;
} while (head);
-}
-
-bool StringCollection::has(const char* s) {
- return mSet.find(std::string(s)) != mSet.end();
+ return set;
}
}; // namespace uirenderer
diff --git a/libs/hwui/utils/StringUtils.h b/libs/hwui/utils/StringUtils.h
index ef2a6d5..055869f 100644
--- a/libs/hwui/utils/StringUtils.h
+++ b/libs/hwui/utils/StringUtils.h
@@ -22,12 +22,16 @@
namespace android {
namespace uirenderer {
-class StringCollection {
+class unordered_string_set : public std::unordered_set<std::string> {
public:
- StringCollection(const char* spacedList);
- bool has(const char* string);
-private:
- std::unordered_set<std::string> mSet;
+ bool has(const char* str) {
+ return find(std::string(str)) != end();
+ }
+};
+
+class StringUtils {
+public:
+ static unordered_string_set split(const char* spacedList);
};
} /* namespace uirenderer */