mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-10-01 01:35:54 -04:00
af360bc9ea
wgetc873988898.patch -O telecomm-01.patch wget0fb5786dbf.patch -O mediaprovider-01.patch wget1a4b9ef510.patch -O wifi-01.patch wget364a1d9962.patch -O bluetooth-01.patch wget87a06448b9.patch -O settings-01.patch wgetaaba724a68.patch -O settings-02.patch wget507304e1f5.patch -O native-01.patch wget89489ff5dd.patch -O base-01.patch wgetd1765c4715.patch -O base-02.patch wgetcbb1a0ecd6.patch -O base-03.patch wget4725772c0b.patch -O base-04.patch wget19747f6923.patch -O base-05.patch wgete7a1aa9ed0.patch -O base-06.patch wget922a7860b1.patch -O base-07.patch wgeted183ed912.patch -O base-08.patch wgetc6fbe1330a.patch -O base-09.patch wget9141cac175.patch -O base-10.patch wget41235bcc67.patch -O av-01.patch wgeta89f704701.patch -O av-02.patch wget6d7cd80d77.patch -O av-03.patch wget75fc175a08.patch -O av-04.patch wgetb023ec300f.patch -O av-05.patch wgetc8117d1539.patch -O av-06.patch wgetf06d23d824.patch -O av-07.patch wget9c7408ab07.patch -O av-08.patch wgetcfbfcefb3c.patch -O launcher-01.patch wget4a27a7f162.patch -O libxml-01.patch Signed-off-by: Tad <tad@spotco.us>
30 lines
1.4 KiB
Diff
30 lines
1.4 KiB
Diff
From c8117d1539078bb3339b5d5fffe063a9135c2c21 Mon Sep 17 00:00:00 2001
|
|
From: Arun Johnson <arunjohnson@google.com>
|
|
Date: Mon, 18 Jul 2022 19:16:04 +0000
|
|
Subject: [PATCH] Adding null check for IResourceManagerClient in dump()
|
|
|
|
bug: 191613308
|
|
Change-Id: I1694f2d1c13163a9b8162630377de71303bc517f
|
|
---
|
|
services/mediaresourcemanager/ResourceManagerService.cpp | 7 +++----
|
|
1 file changed, 3 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/services/mediaresourcemanager/ResourceManagerService.cpp b/services/mediaresourcemanager/ResourceManagerService.cpp
|
|
index b4610bc71e..4d18876bfc 100644
|
|
--- a/services/mediaresourcemanager/ResourceManagerService.cpp
|
|
+++ b/services/mediaresourcemanager/ResourceManagerService.cpp
|
|
@@ -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;
|
|
- Status status = infos[j].client->getName(&clientName);
|
|
- if (!status.isOk()) {
|
|
- clientName = "<unknown client>";
|
|
+ std::string clientName = "<unknown client>";
|
|
+ if (infos[j].client != nullptr) {
|
|
+ Status status = infos[j].client->getName(&clientName);
|
|
}
|
|
snprintf(buffer, SIZE, " Name: %s\n", clientName.c_str());
|
|
result.append(buffer);
|