Merge "Camera VTS: Fix AIDL status typo" into android13-tests-dev am: 1c4170754f am: 98a65f23f0 am: 4761bc032e am: 8c763402a9

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2397737

Change-Id: If5172b4f0158995e349163049369b2fa065690bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-01-25 04:55:54 +00:00 committed by Automerger Merge Worker
commit 6d6cda075b

View file

@ -169,7 +169,7 @@ std::vector<std::string> CameraAidlTest::getCameraDeviceNames(
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;