Revert "add DeviceInfo"
This reverts commit b2442896e3a226c7ebe9d47fa80b257e98a6a34d.
Change-Id: I50f6555451f71067505245333c8e558b5e3b2b3b
diff --git a/libs/hwui/utils/StringUtils.cpp b/libs/hwui/utils/StringUtils.cpp
index ccddd3c..a1df0e7 100644
--- a/libs/hwui/utils/StringUtils.cpp
+++ b/libs/hwui/utils/StringUtils.cpp
@@ -14,24 +14,26 @@
* limitations under the License.
*/
-#include <utils/StringUtils.h>
+#include "StringUtils.h"
namespace android {
namespace uirenderer {
-unordered_string_set&& StringUtils::split(const char* spacedList) {
- unordered_string_set set;
+StringCollection::StringCollection(const char* spacedList) {
const char* current = spacedList;
const char* head = current;
do {
head = strchr(current, ' ');
std::string s(current, head ? head - current : strlen(current));
if (s.length()) {
- set.insert(std::move(s));
+ mSet.insert(s);
}
current = head + 1;
} while (head);
- return std::move(set);
+}
+
+bool StringCollection::has(const char* s) {
+ return mSet.find(std::string(s)) != mSet.end();
}
}; // namespace uirenderer
diff --git a/libs/hwui/utils/StringUtils.h b/libs/hwui/utils/StringUtils.h
index 28b3d63..ef2a6d5 100644
--- a/libs/hwui/utils/StringUtils.h
+++ b/libs/hwui/utils/StringUtils.h
@@ -22,16 +22,12 @@
namespace android {
namespace uirenderer {
-class unordered_string_set : public std::unordered_set<std::string> {
+class StringCollection {
public:
- bool has(const char* str) {
- return find(std::string(str)) != end();
- }
-};
-
-class StringUtils {
-public:
- static unordered_string_set&& split(const char* spacedList);
+ StringCollection(const char* spacedList);
+ bool has(const char* string);
+private:
+ std::unordered_set<std::string> mSet;
};
} /* namespace uirenderer */