Avoid using 'su' when running llkd
When VTS is running, `adb root` will be executed prior to run test
cases. So no need to use su to run llkd. Also, in the latest VTS
testing flow, an user build GSI will be used with a debug ramdisk.
In this case, `adb root` works but there is no /system/xbin/su.
Sample error log:
04-25 14:42:25 E/ProcessHelper: ERROR:root:Failed to start llkd
04-25 15:58:22.300 ERROR Failed to stop llkd
Bug: 131286127
Test: make vts, run a vts test case to check the above error log no
longer exist
Change-Id: I4abaf9c83e82529c25a9150ad1dda350025794f0
Merged-In: I4abaf9c83e82529c25a9150ad1dda350025794f0
(cherry picked from commit 9eb19c838bbb9a2206133cd3f1f565858647d82b)
diff --git a/utils/python/controllers/android_device.py b/utils/python/controllers/android_device.py
index 6cff5bf..1bb0c1c 100644
--- a/utils/python/controllers/android_device.py
+++ b/utils/python/controllers/android_device.py
@@ -671,7 +671,7 @@
"""The MAC address of the device.
"""
try:
- command = 'su root cat /sys/class/net/wlan0/address'
+ command = 'cat /sys/class/net/wlan0/address'
response = self.adb.shell(command)
return response.strip()
except adb.AdbError as e:
@@ -1212,7 +1212,7 @@
self.log.error("Device in fatal error state, skip starting llkd")
return
try:
- self.adb.shell('su root start %s' % LLKD)
+ self.adb.shell('start %s' % LLKD)
except adb.AdbError as e:
logging.error('Failed to start llkd')
@@ -1222,7 +1222,7 @@
self.log.error("Device in fatal error state, skip stop llkd")
return
try:
- self.adb.shell('su root stop %s' % LLKD)
+ self.adb.shell('stop %s' % LLKD)
except adb.AdbError as e:
logging.error('Failed to stop llkd')