summaryrefslogtreecommitdiffstats
path: root/tools/android/mempressure.py
diff options
context:
space:
mode:
Diffstat (limited to 'tools/android/mempressure.py')
-rwxr-xr-xtools/android/mempressure.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/tools/android/mempressure.py b/tools/android/mempressure.py
index 82fe220..77f45a9 100755
--- a/tools/android/mempressure.py
+++ b/tools/android/mempressure.py
@@ -4,6 +4,7 @@
# found in the LICENSE file.
import collections
+import logging
import optparse
import os
import sys
@@ -86,7 +87,13 @@ def main(argv):
device = device_utils.DeviceUtils(None)
- device.old_interface.EnableAdbRoot()
+ try:
+ device.EnableRoot()
+ except device_errors.CommandFailedError as e:
+ # Try to change the flags and start the activity anyway.
+ # TODO(jbudorick) Handle this exception appropriately after interface
+ # conversions are finished.
+ logging.error(str(e))
flags = flag_changer.FlagChanger(device, package_info.cmdline_file)
if ENABLE_TEST_INTENTS_FLAG not in flags.Get():
flags.AddFlags([ENABLE_TEST_INTENTS_FLAG])