commit 1c4170754f558f44565612f4219c2e6fdca4cd05
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jan 25 02:11:46 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 25 02:11:46 2023 +0000
tree a5a0aa3a6bb4a69d32dad1c3cd9bc28c0bf855e1
parent 5da610c66019557ac9e5c0e740d5ac35b9e02aee
parent 7195938fe2a8ed801249d1cf00e8f66539b96ecf

Merge "Camera VTS: Fix AIDL status typo" into android13-tests-dev

camera/provider/aidl/vts/camera_aidl_test.cpp

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;