diff options
| author | Roman Kiryanov <rkir@google.com> | 2021-03-12 21:27:35 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-12 21:27:35 +0000 |
| commit | a0bfbc4db71447dc2786d95127da046ae8cbae67 (patch) | |
| tree | 1017dacb9d3e483574b8c8521aa415d86284ea71 | |
| parent | b0bd09ea6321072a57b884115c37aa43198cb7e1 (diff) | |
| parent | 03ce26263d135eb2bd093c1c1ca0bfbf26b7c475 (diff) | |
| download | platform_hardware_google_camera-a0bfbc4db71447dc2786d95127da046ae8cbae67.tar.gz platform_hardware_google_camera-a0bfbc4db71447dc2786d95127da046ae8cbae67.tar.bz2 platform_hardware_google_camera-a0bfbc4db71447dc2786d95127da046ae8cbae67.zip | |
Use `ro.boot.qemu` to check if the device is an emulator am: 03ce26263d
Original change: https://android-review.googlesource.com/c/platform/hardware/google/camera/+/1627761
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id8d5eba2d776d3ca4b20b72660f99f3107a4e810
| -rw-r--r-- | devices/EmulatedCamera/hwl/EmulatedCameraProviderHWLImpl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/devices/EmulatedCamera/hwl/EmulatedCameraProviderHWLImpl.cpp b/devices/EmulatedCamera/hwl/EmulatedCameraProviderHWLImpl.cpp index 70d87f0..67cbcd6 100644 --- a/devices/EmulatedCamera/hwl/EmulatedCameraProviderHWLImpl.cpp +++ b/devices/EmulatedCamera/hwl/EmulatedCameraProviderHWLImpl.cpp @@ -668,7 +668,7 @@ status_t EmulatedCameraProviderHwlImpl::Initialize() { size_t logical_id = 0; std::vector<const char*> configurationFileLocation; char prop[PROPERTY_VALUE_MAX]; - if (!property_get_bool("ro.kernel.qemu", false)) { + if (!property_get_bool("ro.boot.qemu", false)) { for (const auto& iter : kConfigurationFileLocation) { configurationFileLocation.emplace_back(iter); } |