diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-03-15 20:01:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-15 20:01:42 +0000 |
| commit | e2f625a5488902e0f048de271203bf9a4dd58db1 (patch) | |
| tree | cb2d31c2d52c11eb61ad3ab3784248fb22011d79 | |
| parent | 6cca2033bda4a031e2fe39d5e58c6860e1374f95 (diff) | |
| parent | 707a36deedab3d46307dae4fa536276eb7ea9a11 (diff) | |
| download | rs-e2f625a5488902e0f048de271203bf9a4dd58db1.tar.gz | |
Merge "Use `ro.boot.qemu` to check if the device is an emulator" am: 61e4c87a58 am: 707a36deed
Original change: https://android-review.googlesource.com/c/platform/frameworks/rs/+/1633679
Change-Id: I9c508d7ae6368df2dc6c2d3669468b9c0fee1fde
| -rw-r--r-- | tests/lldb/tests/harness/util_android.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/lldb/tests/harness/util_android.py b/tests/lldb/tests/harness/util_android.py index 16596f59..a0cf700b 100644 --- a/tests/lldb/tests/harness/util_android.py +++ b/tests/lldb/tests/harness/util_android.py @@ -635,7 +635,7 @@ class UtilAndroid(object): # if the remote is an emulator do not even try to reboot # otherwise check whether a reboot is advised - if (self._get_prop('ro.kernel.qemu') != '1' and output and + if (self._get_prop('ro.boot.qemu') != '1' and output and 'Now reboot your device for settings to take effect' in output): self._reboot_device() |