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

Commit 21abd605 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 am: 612563da 

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



Change-Id: I0255a3e975897e930d4b03aceedc4b2863aefea6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e4694e49 612563da

services/camera/libcameraservice/CameraService.cpp

+5 −0
Original line number Diff line number Diff line
@@ -2577,6 +2577,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]));