From 7275a19b5fa4db557c7487f686b5bcd1f4eb3361 Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Mon, 17 Apr 2023 17:21:01 +0000 Subject: [PATCH] envsetup: syswrite - wait after rooting adb root sometimes takes a second, and the next command will fail. Bug: N/A Test: syswrite on device which isn't already rooted Change-Id: I91754c31c74bf0589ea8cbae77c10e5a120bdce5 --- envsetup.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/envsetup.sh b/envsetup.sh index 905635c890..17d8a5d3b9 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -1096,12 +1096,12 @@ function qpid() { # # Easy way to make system.img/etc writable function syswrite() { - adb wait-for-device && adb root || return 1 + adb wait-for-device && adb root && adb wait-for-device || return 1 if [[ $(adb disable-verity | grep -i "reboot") ]]; then echo "rebooting" - adb reboot && adb wait-for-device && adb root || return 1 + adb reboot && adb wait-for-device && adb root && adb wait-for-device || return 1 fi - adb wait-for-device && adb remount || return 1 + adb remount || return 1 } # coredump_setup - enable core dumps globally for any process