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

Commit d06e491f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Migrate from android::String isEmpty to empty" into main am: 594656ed... 

Merge "Migrate from android::String isEmpty to empty" into main am: 594656ed am: c4e9e8e7 am: 0cd042ea am: ff7c699b

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2745913



Change-Id: Ib0eef282b2834f4218352e16c21eeebfb2de6c7b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dac7eb43 ff7c699b

cas/1.0/default/TypeConvert.cpp

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ String8 sessionIdToString(const CasSessionId &sessionId) { 
    for (size_t i = 0; i < sessionId.size(); i++) {

        result.appendFormat("%02x ", sessionId[i]);

    }

    if (result.isEmpty()) {

    if (result.empty()) {

        result.append("(null)");

    }

    return result;

cas/1.1/default/TypeConvert.cpp

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ String8 sessionIdToString(const CasSessionId& sessionId) { 
    for (size_t i = 0; i < sessionId.size(); i++) {

        result.appendFormat("%02x ", sessionId[i]);

    }

    if (result.isEmpty()) {

    if (result.empty()) {

        result.append("(null)");

    }

    return result;

cas/1.2/default/TypeConvert.cpp

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ String8 sessionIdToString(const CasSessionId& sessionId) { 
    for (size_t i = 0; i < sessionId.size(); i++) {

        result.appendFormat("%02x ", sessionId[i]);

    }

    if (result.isEmpty()) {

    if (result.empty()) {

        result.append("(null)");

    }

    return result;