| commit | 77a496a43ee93119acb98ab794c1a89f8545d0bb | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Fri Apr 21 02:34:25 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 21 02:34:25 2023 +0000 |
| tree | 5838ccbddee1b193b825ef545ac500746d125d19 | |
| parent | 5225d6383be1a38fb674db945e9390a3da7fa649 [diff] | |
| parent | 0b14fba8d40765b1154e55e7248d3f0ca33b046c [diff] |
Merge "Camera: Save the HIDL instances regardless of device version" am: 3e2ff26e75 am: 2fd3296122 am: 0b14fba8d4 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2503678 Change-Id: I1a88afc85c9431e8616261a2fe2fd58f9d56aef5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp b/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp index a13b937..8ff5c3f 100644 --- a/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp +++ b/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp
@@ -697,6 +697,11 @@ mTorchStrengthLevel = 0; + if (!kEnableLazyHal) { + // Save HAL reference indefinitely + mSavedInterface = interface; + } + queryPhysicalCameraIds(); // Get physical camera characteristics if applicable @@ -757,13 +762,6 @@ } } } - - if (!kEnableLazyHal) { - // Save HAL reference indefinitely - mSavedInterface = interface; - } - - } status_t HidlProviderInfo::HidlDeviceInfo3::setTorchMode(bool enabled) {