Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Resolve segfault when running send-broadcast command while statscompanion service is not connected"

Browse Source
This commit is contained in:
Howard Ro
2017-11-18 18:39:16 +00:00
committed by Android (Google) Code Review
parent 834e4084bb 4d889e635d
commit fe945d189a
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cmds/statsd/src/StatsService.cpp
View File

@@ -320,9 +320,15 @@ status_t StatsService::cmd_trigger_broadcast(FILE* out, Vector<String8>& args) {
return UNKNOWN_ERROR;
}
auto receiver = mConfigManager->GetConfigReceiver(ConfigKey(uid, name));
auto sc = getStatsCompanionService();
sc->sendBroadcast(String16(receiver.first.c_str()), String16(receiver.second.c_str()));
ALOGD("StatsService::trigger broadcast succeeded to %s, %s", args[1].c_str(), args[2].c_str());
sp<IStatsCompanionService> sc = getStatsCompanionService();
if (sc != nullptr) {
sc->sendBroadcast(String16(receiver.first.c_str()), String16(receiver.second.c_str()));
ALOGD("StatsService::trigger broadcast succeeded to %s, %s", args[1].c_str(),
args[2].c_str());
} else {
ALOGD("Could not access statsCompanion");
}
return NO_ERROR;
}