Inclusive language for CAN bus HAL
Bug: 162745675 Test: it builds Change-Id: I0f9461cd866ccb51743549d978c9f7367499399e
This commit is contained in:
parent
b428f77f6c
commit
09dc1b3f75
3 changed files with 4 additions and 4 deletions
|
@ -254,7 +254,7 @@ static bool match(const hidl_vec<CanMessageFilter>& filter, CanMessageId id, boo
|
|||
satisfiesFilterFlag(rule.extendedFormat, isExtendedId);
|
||||
|
||||
if (rule.exclude) {
|
||||
// Any excluded (blacklist) rule not being satisfied invalidates the whole filter set.
|
||||
// Any exclude rule being satisfied invalidates the whole filter set.
|
||||
if (satisfied) return false;
|
||||
} else {
|
||||
anyNonExcludeRulePresent = true;
|
||||
|
|
|
@ -86,7 +86,7 @@ struct Bus {
|
|||
EXPECT_EQ(ICanController::Result::OK, result);
|
||||
|
||||
/* Not using ICanBus::getService here, since it ignores interfaces not in the manifest
|
||||
* file -- this is a test, so we don't want to add dummy services to a device manifest. */
|
||||
* file -- this is a test, so we don't want to add fake services to a device manifest. */
|
||||
auto manager = hidl::manager::V1_2::IServiceManager::getService();
|
||||
auto service = manager->get(ICanBus::descriptor, config.name);
|
||||
mBus = ICanBus::castFrom(service);
|
||||
|
|
|
@ -119,7 +119,7 @@ bool CanControllerHalTest::up(InterfaceType iftype, std::string srvname, std::st
|
|||
|
||||
void CanControllerHalTest::assertRegistered(std::string srvname, bool expectRegistered) {
|
||||
/* Not using ICanBus::tryGetService here, since it ignores interfaces not in the manifest
|
||||
* file -- this is a test, so we don't want to add dummy services to a device manifest. */
|
||||
* file -- this is a test, so we don't want to add fake services to a device manifest. */
|
||||
auto manager = hidl::manager::V1_2::IServiceManager::getService();
|
||||
auto busService = manager->get(ICanBus::descriptor, srvname);
|
||||
ASSERT_EQ(expectRegistered, busService.withDefault(nullptr) != nullptr)
|
||||
|
@ -145,7 +145,7 @@ TEST_P(CanControllerHalTest, BringUpDown) {
|
|||
assertRegistered(name, false);
|
||||
}
|
||||
|
||||
TEST_P(CanControllerHalTest, DownDummy) {
|
||||
TEST_P(CanControllerHalTest, DownFake) {
|
||||
const auto result = mCanController->downInterface("imnotup");
|
||||
ASSERT_FALSE(result);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue