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

Commit b3932e5f authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Revert "Introduce AttributionAndPermissionUtils."" into main

parents 94df42e1 f075f08d

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,