tree b1eaf705ee6f39f0331136268961f84c6d393cda
parent b4d21c8e80779e28426e75ba97699336289f46cf
author David Drysdale <drysdale@google.com> 1626277814 +0100
committer David Drysdale <drysdale@google.com> 1626278255 +0100

KeyMaster 4.0 VTS: fix GSI detection

Commit f18a8328a1ed ("keymaster: Relax testing under GSI") disabled
some tag checks for devices running with GSI, but detected GSI by
looking for an absence of the ro.boot.vbmeta.device_state property.

This property is currently present on GSI, so instead detect GSI using
the existing is_gsi() helper, which checks ro.product.system.name
against "mainline".

Bug: 192513934
Test: atest VtsHalKeymasterV4_0TargetTest:PerInstance/AttestationTest
Change-Id: If3c7d84a9e091b9b0842e4d8919453600bc239ea
Ignore-AOSP-First: manual merge to aosp/master to follow