From fe72bc0c1d76c2944b2daaad6ac0e9f5d2593ca8 Mon Sep 17 00:00:00 2001 From: Bruce Po Date: Fri, 19 Apr 2024 19:53:22 +0000 Subject: [PATCH 1/3] selinux allow aocxd to access AoC buffers Allow aocxd service to access new device nodes /dev/acd-aocx_inject* /dev/acd-aocx_tapout* type=1400 audit(0.0:88): avc: denied { getattr } for path="/dev/acd-aocx_tapout0" dev="tmpfs" ino=1936 scontext=u:r:aocxd:s0 tcontext=u:object_r:device:s0 tclass=chr_file permissive=0 type=1400 audit(0.0:89): avc: denied { getattr } for path="/dev/acd-aocx_inject0" dev="tmpfs" ino=1937 scontext=u:r:aocxd:s0 tcontext=u:object_r:device:s0 tclass=chr_file permissive=0 BUG: 335884035 Change-Id: Ie4cd637e91f1d9db081bb794a9fb60e3bafe0218 --- aoc/sepolicy/file_contexts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/aoc/sepolicy/file_contexts b/aoc/sepolicy/file_contexts index c43bc75..ed8a6d6 100644 --- a/aoc/sepolicy/file_contexts +++ b/aoc/sepolicy/file_contexts @@ -28,6 +28,8 @@ /dev/acd-audio_ap_offload_tx u:object_r:aoc_device:s0 /dev/acd-mel_processor u:object_r:aoc_device:s0 /dev/acd-aocx_control u:object_r:aoc_device:s0 +/dev/acd-aocx_inject[0-9]* u:object_r:aoc_device:s0 +/dev/acd-aocx_tapout[0-9]* u:object_r:aoc_device:s0 /dev/acd-mc_headpos u:object_r:aoc_device:s0 # AoC vendor binaries From 2a2146024bb8baf97f9c1eafc612afb714d7310c Mon Sep 17 00:00:00 2001 From: Enzo Liao Date: Mon, 22 Apr 2024 04:58:13 +0000 Subject: [PATCH 2/3] Revert "Remove unsed apps (RamdumpService and SSRestartDetector)..." Revert submission 26988480-Remove RamdumpService and SSRestartDetector from AOSP Reason for revert: Exclude AOSP builds by a condition check instead Reverted changes: /q/submissionid:26988480-Remove+RamdumpService+and+SSRestartDetector+from+AOSP Bug: 298102808 Design: go/sys-software-logging Test: Manual Flag: NONE N/A Change-Id: I518af9425d8f808671118c41d1cabd68782c1ff6 --- ramdump_and_coredump/ramdump_and_coredump.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ramdump_and_coredump/ramdump_and_coredump.mk b/ramdump_and_coredump/ramdump_and_coredump.mk index 5c76bf8..b235084 100644 --- a/ramdump_and_coredump/ramdump_and_coredump.mk +++ b/ramdump_and_coredump/ramdump_and_coredump.mk @@ -1,9 +1,11 @@ PRODUCT_PACKAGES += \ sscoredump \ + SSRestartDetector PRODUCT_PACKAGES_DEBUG += \ dump_ramdump \ ramdump \ + RamdumpUploader BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/ramdump_and_coredump/sepolicy From d8a9aa897d00c43501648daddb6f465cb9052291 Mon Sep 17 00:00:00 2001 From: Enzo Liao Date: Mon, 22 Apr 2024 13:06:44 +0800 Subject: [PATCH 3/3] Remove unused apps (RamdumpService and SSRestartDetector) from AOSP. After ag/26620507, the two apps are built in AOSP. AOSP doesn't need them so we should not build them. Bug: 298102808 Design: go/sys-software-logging Test: Manual Flag: NONE N/A Change-Id: I0925fa0bb512a0001bfb46c524c9124128bc5e6e --- ramdump_and_coredump/ramdump_and_coredump.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ramdump_and_coredump/ramdump_and_coredump.mk b/ramdump_and_coredump/ramdump_and_coredump.mk index b235084..24af44e 100644 --- a/ramdump_and_coredump/ramdump_and_coredump.mk +++ b/ramdump_and_coredump/ramdump_and_coredump.mk @@ -1,11 +1,15 @@ PRODUCT_PACKAGES += \ sscoredump \ - SSRestartDetector PRODUCT_PACKAGES_DEBUG += \ dump_ramdump \ ramdump \ - RamdumpUploader + +# When not AOSP targets +ifeq (,$(filter aosp_%, $(TARGET_PRODUCT))) + PRODUCT_PACKAGES += SSRestartDetector + PRODUCT_PACKAGES_DEBUG += RamdumpUploader +endif BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/ramdump_and_coredump/sepolicy