Commit eb88e7b6 authored Oct 18, 2022 by Yi-yo Chiang

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

parent e7f5532e

fs_mgr/tests/adb-remount-test.sh

+1 −1

Original line number	Diff line number	Diff line
		@@ -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