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

Commit 612563da authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix null deref in camera service" into main am: ef703eef am: 05a93a3a 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2647674



Change-Id: I0e34e24280dfcb713cbb0f856e5792fd6621f390
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fc23b0d4 05a93a3a

services/camera/libcameraservice/CameraService.cpp

+5 −0
Original line number Diff line number Diff line
@@ -2462,6 +2462,11 @@ Status CameraService::notifySystemEvent(int32_t eventId, 
        }

        case ICameraService::EVENT_USB_DEVICE_ATTACHED:

        case ICameraService::EVENT_USB_DEVICE_DETACHED: {

            if (args.size() != 1) {

                return Status::fromExceptionCode(Status::EX_ILLEGAL_ARGUMENT,

                    "USB Device Event requires 1 argument");

            }



            // Notify CameraProviderManager for lazy HALs

            mCameraProviderManager->notifyUsbDeviceEvent(eventId,

                                                        std::to_string(args[0]));