diff options
| author | Jiyong Park <jiyong@google.com> | 2019-11-25 11:03:38 +0900 |
|---|---|---|
| committer | Jiyong Park <jiyong@google.com> | 2019-11-30 20:58:45 +0900 |
| commit | b8ba23418aa6868ec14e82c29311021e382a19bc (patch) | |
| tree | 5da0e254ba6fd03803a9c30ec3b77be1a5bca283 /cmds/incidentd | |
| parent | c850bdbec58228e8f441133378158cf41d385718 (diff) | |
unique_fd is passed by value in AIDL interfaces
FileDescriptor type in AIDL was translated into const unique_fd& in C++.
Now, it is unique_fd, i.e. passed by value, to make it easier to keep it
beyond the scope of the call.
Bug: 144943748
Test: m
Change-Id: I2b87761401361f9cf96cdda070f26e70a5c6c935
Diffstat (limited to 'cmds/incidentd')
| -rw-r--r-- | cmds/incidentd/src/IncidentService.cpp | 4 | ||||
| -rw-r--r-- | cmds/incidentd/src/IncidentService.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cmds/incidentd/src/IncidentService.cpp b/cmds/incidentd/src/IncidentService.cpp index 999936bda1d3..cfd77c2357cd 100644 --- a/cmds/incidentd/src/IncidentService.cpp +++ b/cmds/incidentd/src/IncidentService.cpp @@ -279,7 +279,7 @@ Status IncidentService::reportIncident(const IncidentReportArgs& args) { Status IncidentService::reportIncidentToStream(const IncidentReportArgs& args, const sp<IIncidentReportStatusListener>& listener, - const unique_fd& stream) { + unique_fd stream) { IncidentReportArgs argsCopy(args); // Streaming reports can not also be broadcast. @@ -306,7 +306,7 @@ Status IncidentService::reportIncidentToStream(const IncidentReportArgs& args, return Status::ok(); } -Status IncidentService::reportIncidentToDumpstate(const unique_fd& stream, +Status IncidentService::reportIncidentToDumpstate(unique_fd stream, const sp<IIncidentReportStatusListener>& listener) { uid_t caller = IPCThreadState::self()->getCallingUid(); if (caller != AID_ROOT && caller != AID_SHELL) { diff --git a/cmds/incidentd/src/IncidentService.h b/cmds/incidentd/src/IncidentService.h index fb013d0bf92d..b2c7f233e11b 100644 --- a/cmds/incidentd/src/IncidentService.h +++ b/cmds/incidentd/src/IncidentService.h @@ -121,9 +121,9 @@ public: virtual Status reportIncidentToStream(const IncidentReportArgs& args, const sp<IIncidentReportStatusListener>& listener, - const unique_fd& stream); + unique_fd stream); - virtual Status reportIncidentToDumpstate(const unique_fd& stream, + virtual Status reportIncidentToDumpstate(unique_fd stream, const sp<IIncidentReportStatusListener>& listener); virtual Status systemRunning(); |