diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-05-28 03:12:05 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-05-28 03:12:05 +0000 |
| commit | 6220136528a29e96838bf6e18ea81dad9995cecc (patch) | |
| tree | 62d78b6f2b3873de7c078a44a0f7b294e68cdd7e /init/subcontext.cpp | |
| parent | 8c2ad73742ead5dd9cec3ac78be9ca002ca8ee38 (diff) | |
| parent | 0e68ab18fbef221e1a18fbf63babfd5d17bf3b2c (diff) | |
Snap for 5608795 from 0e68ab18fbef221e1a18fbf63babfd5d17bf3b2c to rvc-release
Change-Id: I43f1c8b8baeaab87a6a5eb0d4821df44124bb622
Diffstat (limited to 'init/subcontext.cpp')
| -rw-r--r-- | init/subcontext.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/init/subcontext.cpp b/init/subcontext.cpp index 092c51ceb..467b0d237 100644 --- a/init/subcontext.cpp +++ b/init/subcontext.cpp @@ -141,8 +141,8 @@ void SubcontextProcess::RunCommand(const SubcontextCommand::ExecuteCommand& exec reply->set_success(true); } else { auto* failure = reply->mutable_failure(); - failure->set_error_string(result.error_string()); - failure->set_error_errno(result.error_errno()); + failure->set_error_string(result.error().as_string); + failure->set_error_errno(result.error().as_errno); } } @@ -177,7 +177,7 @@ void SubcontextProcess::MainLoop() { auto init_message = ReadMessage(init_fd_); if (!init_message) { - if (init_message.error_errno() == 0) { + if (init_message.error().as_errno == 0) { // If the init file descriptor was closed, let's exit quietly. If // this was accidental, init will restart us. If init died, this // avoids calling abort(3) unnecessarily. |