diff options
author | Roman Kiryanov <rkir@google.com> | 2021-03-15 22:44:05 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-15 22:44:05 +0000 |
commit | 76102037daf17053bfd2bec7705535e14a727545 (patch) | |
tree | b249c61abd349f7a66e30e998a5940470e22e6ed | |
parent | a365afe785e9926c7acafcaf81f3cc77e27e1611 (diff) | |
parent | 3e323802f9920959ca78477b8043234717c1207f (diff) | |
download | libbt-76102037daf17053bfd2bec7705535e14a727545.tar.gz |
Merge "Use `ro.boot.qemu` to check if the device is an emulator" am: 45a706e4fe am: 316b2ef507 am: 3e323802f9android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid-s-v2-preview-1
Original change: https://android-review.googlesource.com/c/platform/hardware/broadcom/libbt/+/1627760
Change-Id: If310970a0552b9f981dba534b299ca05201cb0dd
-rw-r--r-- | src/upio.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -124,7 +124,7 @@ static int is_emulator_context(void) { char value[PROPERTY_VALUE_MAX]; - property_get("ro.kernel.qemu", value, "0"); + property_get("ro.boot.qemu", value, "0"); UPIODBG("is_emulator_context : %s", value); if (strcmp(value, "1") == 0) { return 1; |