commit 189c0f8115767cee30ab34984b8932765830dd02
author Bernie Innocenti <codewiz@google.com> Tue Dec 22 19:45:18 2020 +0900
committer Bernie Innocenti <codewiz@google.com> Tue Dec 22 11:12:59 2020 +0000
tree 3abfe80f9bc24a1dd01c604177cb96823eb59cff
parent 147c86e712be6c0213c0bfac712e067ed5701d49

Add explicit Result::ok() checks where needed

This is part of a large-scale cleanup to remove operator bool() from
android::base::expected. For more details, see aosp/1533001.

Bug: 176148206
Test: m checkbuild continuous_instrumentation_tests continuous_instrumentation_tests_api_coverage continuous_native_tests device-tests platform_tests
Exempt-From-Owner-Approval: mechanical large-scale change
Change-Id: Iec637c7019927485dd1d814d38471e617276764f

services/inputflinger/InputManager.cpp

diff --git a/services/inputflinger/InputManager.cpp b/services/inputflinger/InputManager.cpp
index 3d99589..a50e5c7 100644
--- a/services/inputflinger/InputManager.cpp
+++ b/services/inputflinger/InputManager.cpp
@@ -148,7 +148,7 @@
     }
 
     base::Result<std::unique_ptr<InputChannel>> channel = mDispatcher->createInputChannel(name);
-    if (!channel) {
+    if (!channel.ok()) {
         return binder::Status::fromExceptionCode(exceptionCodeFromStatusT(channel.error().code()),
                                                  channel.error().message().c_str());
     }