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

Commit 250d06be 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 

am: a8f36c30

Change-Id: I5562e6daa4bd3989ec813c0941e483cab9f3ca82
parents 0045d606 a8f36c30

cmds/dumpsys/tests/dumpsys_test.cpp

+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 << "' ";