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

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

Merge "Adding null check for IResourceManagerClient in dump()" am: fe7b775c... 

Merge "Adding null check for IResourceManagerClient in dump()" am: fe7b775c am: e9871c0a am: ccb264c2 am: 54c9b11a am: 3dd14dc4

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2174244



Change-Id: I55abdf849ab782d3ec6cde878474491bfd140cf5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 77f77c68 3dd14dc4

services/mediaresourcemanager/ResourceManagerService.cpp

+3 −4
Original line number Diff line number Diff line
@@ -271,10 +271,9 @@ binder_status_t ResourceManagerService::dump(int fd, const char** /*args*/, uint 
            snprintf(buffer, SIZE, "        Id: %lld\n", (long long)infos[j].clientId);

            result.append(buffer);



            std::string clientName;

            std::string clientName = "<unknown client>";

            if (infos[j].client != nullptr) {

                Status status = infos[j].client->getName(&clientName);

            if (!status.isOk()) {

                clientName = "<unknown client>";

            }

            snprintf(buffer, SIZE, "        Name: %s\n", clientName.c_str());

            result.append(buffer);