Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c1cd2d2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "ICameraServiceDefault is not available"

parents 819107f3 5a095ea7

camera/tests/CameraBinderTests.cpp

+2 −2
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ 
#include <algorithm>



using namespace android;

using ::android::hardware::ICameraServiceDefault;

using ::android::hardware::ICameraService;

using ::android::hardware::camera2::ICameraDeviceUser;



#define ASSERT_NOT_NULL(x) \
@@ -507,7 +507,7 @@ TEST_F(CameraClientBinderTest, CheckBinderCameraDeviceUser) { 
        bool queryStatus;

        res = device->isSessionConfigurationSupported(sessionConfiguration, &queryStatus);

        EXPECT_TRUE(res.isOk() ||

                (res.serviceSpecificErrorCode() == ICameraServiceDefault::ERROR_INVALID_OPERATION))

                (res.serviceSpecificErrorCode() == ICameraService::ERROR_INVALID_OPERATION))

                << res;

        if (res.isOk()) {

            EXPECT_TRUE(queryStatus);