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

Commit 891b61df authored by Austin Borger's avatar Austin Borger Committed by Android (Google) Code Review
Browse files

Merge "Introduce AttributionAndPermissionUtils." into main

parents a19b4145 249e6590

services/camera/libcameraservice/Android.bp

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

        "aidl/AidlUtils.cpp",

        "aidl/DeathPipe.cpp",

        "utils/AttributionAndPermissionUtils.cpp",

        "utils/CameraServiceProxyWrapper.cpp",

        "utils/CameraThreadState.cpp",

        "utils/CameraTraces.cpp",
@@ -262,7 +263,7 @@ cc_library_static { 
        "liblog",

        "libutils",

        "libxml2",

        "camera_platform_flags_c_lib"

        "camera_platform_flags_c_lib",

    ],



    include_dirs: [

services/camera/libcameraservice/CameraService.cpp

+57 −190

File changed.

Preview size limit exceeded, changes collapsed.

services/camera/libcameraservice/CameraService.h

+26 −36

File changed.

Preview size limit exceeded, changes collapsed.

services/camera/libcameraservice/api1/Camera2Client.cpp

+3 −1
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ 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,
@@ -68,7 +69,8 @@ Camera2Client::Camera2Client(const sp<CameraService>& cameraService, 
        bool overrideForPerfClass,

        bool overrideToPortrait,

        bool forceSlowJpegMode):

        Camera2ClientBase(cameraService, cameraClient, cameraServiceProxyWrapper, clientPackageName,

        Camera2ClientBase(cameraService, cameraClient, cameraServiceProxyWrapper,

                attributionAndPermissionUtils, clientPackageName,

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

                cameraDeviceId, api1CameraId, cameraFacing, sensorOrientation, clientPid,

                clientUid, servicePid, overrideForPerfClass, overrideToPortrait,

services/camera/libcameraservice/api1/Camera2Client.h

+1 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ 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,