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

Commit ab2b3e66 authored by Xin Li's avatar Xin Li
Browse files

Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future 

Bug: 343100748
Merged-In: I9cf28cae0c4836035290123ae33cf6d94052585e
Change-Id: Ie8e29d05adc642627a433f1374f28623cbafe528
parents b97e7d63 3ac36cbd

services/camera/libcameraservice/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -186,7 +186,6 @@ cc_library { 
        "aidl/AidlCameraServiceListener.cpp",

        "aidl/AidlUtils.cpp",

        "aidl/DeathPipe.cpp",

        "utils/AttributionAndPermissionUtils.cpp",

        "utils/CameraServiceProxyWrapper.cpp",

        "utils/CameraThreadState.cpp",

        "utils/CameraTraces.cpp",

services/camera/libcameraservice/CameraService.cpp

+159 −84

File changed.

Preview size limit exceeded, changes collapsed.

services/camera/libcameraservice/CameraService.h

+26 −42

File changed.

Preview size limit exceeded, changes collapsed.

services/camera/libcameraservice/api1/Camera2Client.cpp

+1 −3
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ using namespace camera2; 
Camera2Client::Camera2Client(const sp<CameraService>& cameraService,

        const sp<hardware::ICameraClient>& cameraClient,

        std::shared_ptr<CameraServiceProxyWrapper> cameraServiceProxyWrapper,

        std::shared_ptr<AttributionAndPermissionUtils> attributionAndPermissionUtils,

        const std::string& clientPackageName,

        const std::optional<std::string>& clientFeatureId,

        const std::string& cameraDeviceId,
@@ -69,8 +68,7 @@ Camera2Client::Camera2Client(const sp<CameraService>& cameraService, 
        bool overrideForPerfClass,

        bool overrideToPortrait,

        bool forceSlowJpegMode):

        Camera2ClientBase(cameraService, cameraClient, cameraServiceProxyWrapper,

                attributionAndPermissionUtils, clientPackageName,

        Camera2ClientBase(cameraService, cameraClient, cameraServiceProxyWrapper, clientPackageName,

                false/*systemNativeClient - since no ndk for api1*/, clientFeatureId,

                cameraDeviceId, api1CameraId, cameraFacing, sensorOrientation, clientPid,

                clientUid, servicePid, overrideForPerfClass, overrideToPortrait,

services/camera/libcameraservice/api1/Camera2Client.h

+0 −1
Original line number Diff line number Diff line
@@ -103,7 +103,6 @@ public: 
    Camera2Client(const sp<CameraService>& cameraService,

            const sp<hardware::ICameraClient>& cameraClient,

            std::shared_ptr<CameraServiceProxyWrapper> cameraServiceProxyWrapper,

            std::shared_ptr<AttributionAndPermissionUtils> attributionAndPermissionUtils,

            const std::string& clientPackageName,

            const std::optional<std::string>& clientFeatureId,

            const std::string& cameraDeviceId,