From 2ca86b68bfb2d8e1e7e252e4d3c8722693cfce6e Mon Sep 17 00:00:00 2001 From: Nishith Khanna Date: Fri, 12 Apr 2024 10:02:33 +0530 Subject: [PATCH 1/3] av: Add gitlab ci job to track changes from upstream Change-Id: I63c135fa01a2b462e1460423effeb8dcb60e53a7 --- .gitlab-ci.yml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000000..67a20ad8d5 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,8 @@ +stages: + - update-from-upstream + +include: + - project: 'e/templates' + ref: master + file: '/gitlab-ci/.gitlab-ci-import-updates-from-upstream.yml' + -- GitLab From 43ae7144ad1d0814476f89d6808c14cbbd115502 Mon Sep 17 00:00:00 2001 From: Alexandre R D'Anzi Date: Thu, 22 Feb 2024 16:30:54 +0000 Subject: [PATCH 2/3] av: Adding automerge script Change-Id: Iad6a6237293d2f6c1b7d2a5e4eca9026098f2852 --- .gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 67a20ad8d5..c858576a28 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,11 @@ stages: + - auto-merge-main - update-from-upstream include: + - project: 'e/templates' + ref: master + file: '/gitlab-ci/.gitlab-ci-auto-merge-main.yml' - project: 'e/templates' ref: master file: '/gitlab-ci/.gitlab-ci-import-updates-from-upstream.yml' -- GitLab From b494018f6125d83e0e545d31a23d80c01b1de98d Mon Sep 17 00:00:00 2001 From: Fairphone ODM Date: Sat, 8 May 2021 16:55:51 +0800 Subject: [PATCH 3/3] libcameraservice: Customize camera stack based on active app The camera stack needs to expose different features depending on whether the FP4 specific camera or third party apps are using it. This is achieved via a system property that's configured while the camera is in use. Change-Id: I834c6155de872bf4218a7b0a749f2c0143d8bc1f --- services/camera/libcameraservice/Android.bp | 5 +++++ services/camera/libcameraservice/CameraService.cpp | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/services/camera/libcameraservice/Android.bp b/services/camera/libcameraservice/Android.bp index 5b76bb0c0f..06244accf8 100644 --- a/services/camera/libcameraservice/Android.bp +++ b/services/camera/libcameraservice/Android.bp @@ -121,6 +121,7 @@ cc_library { name: "libcameraservice", defaults: [ + "camera_expose_clientpkgname_defaults", "libcameraservice_deps", ], // Camera service source @@ -235,6 +236,10 @@ cc_library_static { name: "libcameraservice_device_independent", host_supported: true, + defaults: [ + "camera_expose_clientpkgname_defaults", + ], + // Camera service source srcs: [ diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp index 2d55f39b25..8db85cf2d7 100644 --- a/services/camera/libcameraservice/CameraService.cpp +++ b/services/camera/libcameraservice/CameraService.cpp @@ -86,6 +86,10 @@ #include "utils/CameraServiceProxyWrapper.h" #include "utils/SessionConfigurationUtils.h" +#ifdef TARGET_CAMERA_EXPOSE_CLIENTPKGNAME +#define PROPERTY_CAMERA_PACKAGENAME "debug.camera.packagename" +#endif + namespace { const char* kPermissionServiceName = "permission"; const char* kActivityServiceName = "activity"; @@ -2486,6 +2490,9 @@ Status CameraService::connectHelper(const sp& cameraCb, const std::str int originalClientPid = 0; +#ifdef TARGET_CAMERA_EXPOSE_CLIENTPKGNAME + property_set(PROPERTY_CAMERA_PACKAGENAME, clientPackageName.c_str()); +#endif int packagePid = (clientPid == USE_CALLING_PID) ? CameraThreadState::getCallingPid() : clientPid; ALOGI("CameraService::connect call (PID %d \"%s\", camera ID %s) and " -- GitLab