| commit | 575227ad8a562695f83e86f2bef5a079f76dfb44 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Jan 25 19:38:07 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 25 19:38:07 2023 +0000 |
| tree | 4d8d06223a9a0010cae81cc86354b2ae9523ee5a | |
| parent | 0a755835d81cf0825f555a14686f643dd5ee6964 [diff] | |
| parent | 5b1233def1207810daa3cdf3e3a3b3dffd69f507 [diff] |
Merge "Camera VTS: Fix AIDL status typo" into android13-tests-dev am: 1c4170754f am: 5b1233def1 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2397737 Change-Id: I02ee1f6c454708817f6b5154f2c98e8a643f3dad 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;