[Android] Convert to DeviceUtils versions of IsOnline, HasRoot, and EnableRoot.

BUG=267773

Review URL: https://codereview.chromium.org/285143002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271213 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 17 insertions, 2 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])
diff --git a/tools/memory_inspector/memory_inspector/backends/android/android_backend.py b/tools/memory_inspector/memory_inspector/backends/android/android_backend.py
index 4bae745..5ddfd35 100644
--- a/tools/memory_inspector/memory_inspector/backends/android/android_backend.py
+++ b/tools/memory_inspector/memory_inspector/backends/android/android_backend.py
@@ -11,6 +11,7 @@ import datetime
 import glob
 import hashlib
 import json
+import logging
 import os
 import posixpath
 
@@ -26,6 +27,7 @@ from memory_inspector.core import symbol
 # The memory_inspector/__init__ module will add the <CHROME_SRC>/build/android
 # deps to the PYTHONPATH for pylib.
 from pylib import android_commands
+from pylib.device import device_errors
 from pylib.device import device_utils
 from pylib.symbols import elf_symbolizer
 
@@ -173,7 +175,13 @@ class AndroidDevice(backends.Device):
 
   def Initialize(self):
     """Starts adb root and deploys the prebuilt binaries on initialization."""
-    self.underlying_device.old_interface.EnableAdbRoot()
+    try:
+      self.underlying_device.EnableRoot()
+    except device_errors.CommandFailedError as e:
+      # Try to deploy memdump and ps_ext anyway.
+      # TODO(jbudorick) Handle this exception appropriately after interface
+      #                 conversions are finished.
+      logging.error(str(e))
 
     # Download (from GCS) and deploy prebuilt helper binaries on the device.
     self._DeployPrebuiltOnDeviceIfNeeded(_MEMDUMP_PREBUILT_PATH,