From 3648ac967a6707767ef2df1cb9aa93b1a1a83f2d Mon Sep 17 00:00:00 2001 From: Eric Jeong Date: Fri, 18 Sep 2020 12:14:54 -0700 Subject: [PATCH] Return immediately when prop is not found - when VHAL prop is not supported, getPropConfigs calls hidl callback with INVALID_ARG and has to return. - otherwise, there will be two callbacks invoked from VHAL. Bug: 168834308 Test: seahawk should boot up Change-Id: I41f5ddf26b9ba70221d59bae10d7ca9a2133a9eb Merged-In: I41f5ddf26b9ba70221d59bae10d7ca9a2133a9eb (cherry picked from commit 26abceefbe8f2d8bb11b684e9c3bdc5dc68ab581) --- automotive/vehicle/2.0/default/common/src/VehicleHalManager.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/automotive/vehicle/2.0/default/common/src/VehicleHalManager.cpp b/automotive/vehicle/2.0/default/common/src/VehicleHalManager.cpp index b09e9bfba0..dc5d3d300e 100644 --- a/automotive/vehicle/2.0/default/common/src/VehicleHalManager.cpp +++ b/automotive/vehicle/2.0/default/common/src/VehicleHalManager.cpp @@ -78,6 +78,7 @@ Return VehicleHalManager::getPropConfigs(const hidl_vec &properti } else { ALOGW("Requested config for undefined property: 0x%x", prop); _hidl_cb(StatusCode::INVALID_ARG, hidl_vec()); + return Void(); } }