tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

adb-remount-test: report usb user on unexpected connection

Browse source 
Test: adb-remount-test.sh
Bug: 132070014
Change-Id: I1bc4009b71cac4ac4e06df38cc4da77f2819b88b
This commit is contained in:
Mark Salyzyn 2019-05-06 09:19:43 -07:00
parent 93bb1d0d6d
commit dbd99f0d2b
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
fs_mgr/tests/adb-remount-test.sh
View file

@ -261,6 +261,13 @@ adb_wait() {
return ${ret}
}
[ "USAGE: adb_user > /dev/stdout
Returns: the adb daemon user" ]
adb_user() {
adb_sh echo '${USER}' </dev/null
}
[ "USAGE: usb_status > stdout 2> stderr
Assumes referenced right after adb_wait or fastboot_wait failued.
@ -276,7 +283,7 @@ usb_status() {
elif inRecovery; then
echo "(In recovery mode)"
elif inAdb; then
echo "(In adb mode)"
echo "(In adb mode `adb_user`)"
else
echo "(USB stack borken for ${USB_ADDRESS})"
USB_DEVICE=`usb_devnum`
@ -423,11 +430,11 @@ NB: This can be flakey on devices due to USB state
Returns: true if device in root state" ]
adb_root() {
[ root != "`adb_sh echo '${USER}' </dev/null`" ] || return 0
[ root != "`adb_user`" ] || return 0
adb root >/dev/null </dev/null 2>/dev/null
sleep 2
adb_wait 2m &&
[ root = "`adb_sh echo '${USER}' </dev/null`" ]
[ root = "`adb_user`" ]
}
[ "USAGE: adb_unroot
@ -436,11 +443,11 @@ NB: This can be flakey on devices due to USB state
Returns: true if device in un root state" ]
adb_unroot() {
[ root = "`adb_sh echo '${USER}' </dev/null`" ] || return 0
[ root = "`adb_user`" ] || return 0
adb unroot >/dev/null </dev/null 2>/dev/null
sleep 2
adb_wait 2m &&
[ root != "`adb_sh echo '${USER}' </dev/null`" ]
[ root != "`adb_user`" ]
}
[ "USAGE: fastboot_getvar var expected >/dev/stderr