From eb88e7b677cab10ca7bceca70226f6a84f3dc728 Mon Sep 17 00:00:00 2001 From: Yi-yo Chiang Date: Tue, 18 Oct 2022 07:32:13 +0000 Subject: [PATCH] Use ro.product.vendor.device to determine if running on Cuttlefish Similar reasoning as aosp/2255456. ro.product.device could be overridden by GSI if system.img was replaced with GSI. Use ro.product.vendor.device, which comes from the vendor.img, to determine the "device" type. Bug: 243116800 Test: adb-remount-test on cuttlefish Change-Id: Ib4a956047ef46d8e4837b27334f8d58162d4fa2a --- fs_mgr/tests/adb-remount-test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs_mgr/tests/adb-remount-test.sh b/fs_mgr/tests/adb-remount-test.sh index eba4f6e47..68f8152cf 100755 --- a/fs_mgr/tests/adb-remount-test.sh +++ b/fs_mgr/tests/adb-remount-test.sh @@ -1423,7 +1423,7 @@ LOG RUN "flash vendor, and confirm vendor override disappears" is_bootloader_fastboot=true # cuttlefish? -[[ "$(get_property ro.product.device)" == vsoc* ]] && +[[ "$(get_property ro.product.vendor.device)" == vsoc_* ]] && is_bootloader_fastboot=false is_userspace_fastboot=false