diff options
| author | jbudorick@chromium.org <jbudorick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-08 19:30:44 +0000 |
|---|---|---|
| committer | jbudorick@chromium.org <jbudorick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-08 19:30:44 +0000 |
| commit | 86a40aa54a56e66fc1212244a0ca08a5e6844698 (patch) | |
| tree | 7a1009948510be7f22129c7fdac8695569379e5b /tools/memory_inspector | |
| parent | c43ef8425924d1c9db551d9482339e81b986452a (diff) | |
| download | chromium_src-86a40aa54a56e66fc1212244a0ca08a5e6844698.zip chromium_src-86a40aa54a56e66fc1212244a0ca08a5e6844698.tar.gz chromium_src-86a40aa54a56e66fc1212244a0ca08a5e6844698.tar.bz2 | |
[Android] Switch to DeviceUtils versions of Ls, SetJavaAsserts, GetProp, and SetProp.
BUG=267773
Review URL: https://codereview.chromium.org/371813005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@281794 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/memory_inspector')
| -rw-r--r-- | tools/memory_inspector/memory_inspector/backends/android/android_backend.py | 9 |
1 files changed, 4 insertions, 5 deletions
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 8fcfebf..bf10d5d 100644 --- a/tools/memory_inspector/memory_inspector/backends/android/android_backend.py +++ b/tools/memory_inspector/memory_inspector/backends/android/android_backend.py @@ -166,7 +166,7 @@ class AndroidDevice(backends.Device): settings=backends.Settings(AndroidDevice._SETTINGS_KEYS)) self.underlying_device = underlying_device self._id = underlying_device.old_interface.GetDevice() - self._name = underlying_device.old_interface.GetProductModel() + self._name = underlying_device.GetProp('ro.product.model') self._sys_stats = None self._last_device_stats = None self._sys_stats_last_update = None @@ -192,15 +192,14 @@ class AndroidDevice(backends.Device): def IsNativeTracingEnabled(self): """Checks for the libc.debug.malloc system property.""" - return bool(self.underlying_device.old_interface.system_properties[ - _DLMALLOC_DEBUG_SYSPROP]) + return bool(self.underlying_device.GetProp( + _DLMALLOC_DEBUG_SYSPROP)) def EnableNativeTracing(self, enabled): """Enables libc.debug.malloc and restarts the shell.""" assert(self._initialized) prop_value = '1' if enabled else '' - self.underlying_device.old_interface.system_properties[ - _DLMALLOC_DEBUG_SYSPROP] = prop_value + self.underlying_device.SetProp(_DLMALLOC_DEBUG_SYSPROP, prop_value) assert(self.IsNativeTracingEnabled()) # The libc.debug property takes effect only after restarting the Zygote. self.underlying_device.old_interface.RestartShell() |