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

Commit 2b849d32 authored by Charles Chen's avatar Charles Chen Committed by Android Build Coastguard Worker
Browse files

Revert "Introduce AttributionAndPermissionUtils." 

This reverts commit 17e3ebe8.

Reason for revert: Local testing + debugging
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f075f08d80497aafc2b3ee1c4358f5e8559b5c99)
Merged-In: I2e8a8cd456d1fb7f8d12072f6f0aaa12e6dc6e6c
Change-Id: I2e8a8cd456d1fb7f8d12072f6f0aaa12e6dc6e6c
parent f4b214fc

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,