| commit | 98a65f23f07563d3a6bb59a34a899d919f1983f7 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Jan 25 02:36:52 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 25 02:36:52 2023 +0000 |
| tree | cf79b6e5dcc6c8c24df8ddc0040821c0212cc865 | |
| parent | 77373d5774c173c5e74d6045d1730b01e7112037 [diff] | |
| parent | 1c4170754f558f44565612f4219c2e6fdca4cd05 [diff] |
Merge "Camera VTS: Fix AIDL status typo" into android13-tests-dev am: 1c4170754f Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2397737 Change-Id: I41ac1e6f5f871ca24aace3a1086dd5b24fbd3c7e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/camera/provider/aidl/vts/camera_aidl_test.cpp b/camera/provider/aidl/vts/camera_aidl_test.cpp index 2c2f1b2..48816ad9 100644 --- a/camera/provider/aidl/vts/camera_aidl_test.cpp +++ b/camera/provider/aidl/vts/camera_aidl_test.cpp
@@ -167,7 +167,7 @@ ScopedAStatus physicalCameraDeviceStatusChange( const std::string&, const std::string&, ::aidl::android::hardware::camera::common::CameraDeviceStatus) override { - return ndk::ScopedAStatus(); + return ScopedAStatus::ok(); } std::vector<std::string> externalCameraDeviceNames;