Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8f36c30 authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge "dumpsys: remove usage of String16::std_string"

am: 561b4e5d

Change-Id: Ie64c773351594a8925d32b5513e912418bcf35d7
parents ccaa1f3f 561b4e5d
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -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 = String16::std_string(actual);
        std::string actual_str = String8(actual).c_str();
        std::string expected_str = expected[i];
        actual_stream << "'" << actual_str << "' ";
        expected_stream << "'" << expected_str << "' ";