OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4537012
)
dumpsys: remove usage of String16::std_string
author
Steven Moreland
<smoreland@google.com>
Fri, 10 Mar 2017 06:59:32 +0000
(22:59 -0800)
committer
Steven Moreland
<smoreland@google.com>
Fri, 10 Mar 2017 07:00:02 +0000
(23:00 -0800)
Test: pass
Change-Id: Ib74a126b91d25376a7235f73bbc12ada62ae7e69
cmds/dumpsys/tests/dumpsys_test.cpp
patch
|
blob
|
history
diff --git
a/cmds/dumpsys/tests/dumpsys_test.cpp
b/cmds/dumpsys/tests/dumpsys_test.cpp
index
a61cb00
..
66beb6d
100644
(file)
--- a/
cmds/dumpsys/tests/dumpsys_test.cpp
+++ b/
cmds/dumpsys/tests/dumpsys_test.cpp
@@
-23,6
+23,7
@@
#include <android-base/file.h>
#include <utils/String16.h>
+#include <utils/String8.h>
#include <utils/Vector.h>
using namespace android;
@@
-95,7
+96,7
@@
MATCHER_P(AndroidElementsAre, expected, "") {
int i = 0;
std::ostringstream actual_stream, expected_stream;
for (String16 actual : arg) {
- std::string actual_str = String
16::std_string(actual
);
+ std::string actual_str = String
8(actual).c_str(
);
std::string expected_str = expected[i];
actual_stream << "'" << actual_str << "' ";
expected_stream << "'" << expected_str << "' ";