Merge "adb-remount-test: adb_reboot stdin issue"
This commit is contained in:
commit
2dca188503
1 changed files with 4 additions and 4 deletions
|
|
@ -173,7 +173,7 @@ adb_cat() {
|
|||
|
||||
Returns: true if the reboot command succeeded" ]
|
||||
adb_reboot() {
|
||||
adb reboot remount-test || true
|
||||
adb reboot remount-test </dev/null || true
|
||||
sleep 2
|
||||
}
|
||||
|
||||
|
|
@ -1004,7 +1004,7 @@ echo "${GREEN}[ RUN ]${NORMAL} reboot to confirm content persistent" >&2
|
|||
fixup_from_recovery() {
|
||||
inRecovery || return 1
|
||||
echo "${ORANGE}[ ERROR ]${NORMAL} Device in recovery" >&2
|
||||
adb reboot
|
||||
adb reboot </dev/null
|
||||
adb_wait 2m
|
||||
}
|
||||
|
||||
|
|
@ -1074,7 +1074,7 @@ elif [ "${ANDROID_PRODUCT_OUT}" = "${ANDROID_PRODUCT_OUT%*/${H}}" ]; then
|
|||
elif [ -z "${ANDROID_HOST_OUT}" ]; then
|
||||
echo "${ORANGE}[ WARNING ]${NORMAL} please run lunch, skipping"
|
||||
else
|
||||
adb reboot fastboot ||
|
||||
adb reboot fastboot </dev/null ||
|
||||
die "fastbootd not supported (wrong adb in path?)"
|
||||
any_wait 2m &&
|
||||
inFastboot ||
|
||||
|
|
@ -1185,7 +1185,7 @@ if [ -n "${scratch_partition}" ]; then
|
|||
|
||||
echo "${GREEN}[ RUN ]${NORMAL} test fastboot flash to ${scratch_partition} recovery" >&2
|
||||
|
||||
adb reboot fastboot ||
|
||||
adb reboot fastboot </dev/null ||
|
||||
die "Reboot into fastbootd"
|
||||
img=${TMPDIR}/adb-remount-test-${$}.img
|
||||
cleanup() {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue