Snap for 4411005 from cc2aa189ae1dd7007e7b6956c27a77cd6a185ee7 to oc-mr1-release
Change-Id: Id9e7052adc6ca6a9e8d17213b53e22733b5df1f2
diff --git a/acts/framework/acts/libs/ota/ota_runners/ota_runner.py b/acts/framework/acts/libs/ota/ota_runners/ota_runner.py
index dd58943..776c900 100644
--- a/acts/framework/acts/libs/ota/ota_runners/ota_runner.py
+++ b/acts/framework/acts/libs/ota/ota_runners/ota_runner.py
@@ -42,7 +42,7 @@
logging.info('Boot completed. Rooting adb.')
self.android_device.root_adb()
logging.info('Root complete. Installing new SL4A.')
- output = self.android_device.adb.install('-r %s' % self.get_sl4a_apk)
+ output = self.android_device.adb.install('-r %s' % self.get_sl4a_apk())
logging.info('SL4A install output: %s' % output)
time.sleep(SL4A_SERVICE_SETUP_TIME)
logging.info('Starting services.')
diff --git a/acts/framework/acts/libs/ota/ota_tools/update_device_ota_tool.py b/acts/framework/acts/libs/ota/ota_tools/update_device_ota_tool.py
index 0ab9091..978842f 100644
--- a/acts/framework/acts/libs/ota/ota_tools/update_device_ota_tool.py
+++ b/acts/framework/acts/libs/ota/ota_tools/update_device_ota_tool.py
@@ -43,8 +43,8 @@
def update(self, ota_runner):
logging.info('Forcing adb to be in root mode.')
ota_runner.android_device.root_adb()
- update_command = '%s -s %s %s' % (self.command, ota_runner.serial,
- ota_runner.get_ota_package())
+ update_command = 'python2.7 %s -s %s %s' % (
+ self.command, ota_runner.serial, ota_runner.get_ota_package())
logging.info('Running %s' % update_command)
result = job.run(update_command, timeout=UPDATE_TIMEOUT)
logging.info('Output: %s' % result.stdout)
