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

Commit 05a93a3a 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 

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



Change-Id: I851e759541af6b99df04d53054e0ee71e5b3dd14
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 49b9a4b3 ef703eef

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]));