Snap for 11297328 from b824d770f4
to 24Q2-release
Change-Id: Ib02dfb7354c90fcfe10896a280535767d4b24f4f
This commit is contained in:
commit
48c64fb600
15 changed files with 55 additions and 11 deletions
|
@ -1,7 +1,8 @@
|
||||||
BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/aoc/sepolicy
|
BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/aoc/sepolicy
|
||||||
|
|
||||||
PRODUCT_PACKAGES += dump_aoc \
|
PRODUCT_PACKAGES += dump_aoc \
|
||||||
aocd
|
aocd \
|
||||||
|
aocxd
|
||||||
|
|
||||||
ifeq (,$(filter aosp_%,$(TARGET_PRODUCT)))
|
ifeq (,$(filter aosp_%,$(TARGET_PRODUCT)))
|
||||||
# IAudioMetricExt HIDL
|
# IAudioMetricExt HIDL
|
||||||
|
@ -23,4 +24,5 @@ PRODUCT_PACKAGES_DEBUG += \
|
||||||
aocdump \
|
aocdump \
|
||||||
aocutil \
|
aocutil \
|
||||||
aoc_audio_cfg \
|
aoc_audio_cfg \
|
||||||
vp_util
|
vp_util \
|
||||||
|
aocx_tool
|
||||||
|
|
25
aoc/sepolicy/aocxd.te
Normal file
25
aoc/sepolicy/aocxd.te
Normal file
|
@ -0,0 +1,25 @@
|
||||||
|
# aocxd server domain
|
||||||
|
type aocxd, domain;
|
||||||
|
type aocxd_exec, vendor_file_type, exec_type, file_type;
|
||||||
|
init_daemon_domain(aocxd)
|
||||||
|
|
||||||
|
# sysfs operations
|
||||||
|
allow aocxd sysfs_aoc:dir search;
|
||||||
|
|
||||||
|
# dev operations
|
||||||
|
allow aocxd aoc_device:chr_file rw_file_perms;
|
||||||
|
|
||||||
|
# allow inotify to watch for additions/removals from /dev
|
||||||
|
allow aocxd device:dir r_dir_perms;
|
||||||
|
|
||||||
|
# set properties
|
||||||
|
set_prop(aocxd, vendor_aoc_prop);
|
||||||
|
|
||||||
|
# allow binder access
|
||||||
|
vndbinder_use(aocxd);
|
||||||
|
|
||||||
|
# allow managing wakelocks
|
||||||
|
wakelock_use(aocxd);
|
||||||
|
|
||||||
|
# add aocx service to the domain
|
||||||
|
add_service(aocxd, aocx);
|
|
@ -27,11 +27,13 @@
|
||||||
/dev/acd-audio_ap_offload_rx u:object_r:aoc_device:s0
|
/dev/acd-audio_ap_offload_rx u:object_r:aoc_device:s0
|
||||||
/dev/acd-audio_ap_offload_tx u:object_r:aoc_device:s0
|
/dev/acd-audio_ap_offload_tx u:object_r:aoc_device:s0
|
||||||
/dev/acd-mel_processor 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
|
||||||
|
|
||||||
# AoC vendor binaries
|
# AoC vendor binaries
|
||||||
/vendor/bin/aocd u:object_r:aocd_exec:s0
|
/vendor/bin/aocd u:object_r:aocd_exec:s0
|
||||||
/vendor/bin/aocdump u:object_r:aocdump_exec:s0
|
/vendor/bin/aocdump u:object_r:aocdump_exec:s0
|
||||||
/vendor/bin/dump/dump_aoc u:object_r:dump_aoc_exec:s0
|
/vendor/bin/dump/dump_aoc u:object_r:dump_aoc_exec:s0
|
||||||
|
/vendor/bin/aocxd u:object_r:aocxd_exec:s0
|
||||||
|
|
||||||
# AoC audio files
|
# AoC audio files
|
||||||
/vendor/etc/aoc(/.*)? u:object_r:aoc_audio_file:s0
|
/vendor/etc/aoc(/.*)? u:object_r:aoc_audio_file:s0
|
||||||
|
|
1
aoc/sepolicy/vndservice.te
Normal file
1
aoc/sepolicy/vndservice.te
Normal file
|
@ -0,0 +1 @@
|
||||||
|
type aocx, vndservice_manager_type;
|
1
aoc/sepolicy/vndservice_contexts
Normal file
1
aoc/sepolicy/vndservice_contexts
Normal file
|
@ -0,0 +1 @@
|
||||||
|
aocx.IAocx u:object_r:aocx:s0
|
|
@ -1,4 +1,3 @@
|
||||||
# Audio
|
# Audio
|
||||||
vendor.google.whitechapel.audio.extension.IAudioExtension/default u:object_r:hal_audio_ext_service:s0
|
vendor.google.whitechapel.audio.extension.IAudioExtension/default u:object_r:hal_audio_ext_service:s0
|
||||||
android.media.audio.IHalAdapterVendorExtension/default u:object_r:hal_audio_parameter_parser_service:s0
|
android.media.audio.IHalAdapterVendorExtension/default u:object_r:hal_audio_parameter_parser_service:s0
|
||||||
|
|
||||||
|
|
|
@ -34,3 +34,7 @@ userdebug_or_eng(`
|
||||||
')
|
')
|
||||||
|
|
||||||
wakelock_use(hal_audio_default);
|
wakelock_use(hal_audio_default);
|
||||||
|
|
||||||
|
vndbinder_use(hal_audio_default);
|
||||||
|
allow hal_audio_default aocx:service_manager find;
|
||||||
|
binder_call(hal_audio_default, aocxd);
|
||||||
|
|
|
@ -5,7 +5,8 @@ package {
|
||||||
sh_binary {
|
sh_binary {
|
||||||
name: "dump_syna.sh",
|
name: "dump_syna.sh",
|
||||||
src: "dump_syna.sh",
|
src: "dump_syna.sh",
|
||||||
init_rc: ["init.touch.syna20.rc"],
|
init_rc: ["init.touch.syna.rc"],
|
||||||
vendor: true,
|
vendor: true,
|
||||||
sub_dir: "dump",
|
sub_dir: "dump",
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
5
touch/syna/init.touch.syna.rc
Normal file
5
touch/syna/init.touch.syna.rc
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
on property:sys.boot_completed=1
|
||||||
|
chown system system /sys/class/spi_master/spi19/spi19.0/synaptics_tcm.0/sysfs/get_raw_data
|
||||||
|
chown system system /sys/class/spi_master/spi19/spi19.0/synaptics_tcm.0/sysfs/force_active
|
||||||
|
chown system system /sys/class/spi_master/spi20/spi20.0/synaptics_tcm.0/sysfs/get_raw_data
|
||||||
|
chown system system /sys/class/spi_master/spi20/spi20.0/synaptics_tcm.0/sysfs/force_active
|
|
@ -1,3 +0,0 @@
|
||||||
on property:vendor.device.modules.ready=1
|
|
||||||
chown system system /sys/class/spi_master/spi20/spi20.0/synaptics_tcm.0/sysfs/get_raw_data
|
|
||||||
chown system system /sys/class/spi_master/spi20/spi20.0/synaptics_tcm.0/sysfs/force_active
|
|
|
@ -1,3 +1,5 @@
|
||||||
genfscon sysfs /devices/platform/10d10000.spi/spi_master/spi0/spi0.0/synaptics_tcm.0/sysfs u:object_r:sysfs_touch:s0
|
genfscon sysfs /devices/platform/10d10000.spi/spi_master/spi0/spi0.0/synaptics_tcm.0/sysfs u:object_r:sysfs_touch:s0
|
||||||
|
genfscon sysfs /devices/platform/111c0000.spi/spi_master/spi19/spi19.0/synaptics_tcm.0/sysfs u:object_r:sysfs_touch:s0
|
||||||
|
genfscon sysfs /devices/platform/111c0000.spi/spi_master/spi19/spi19.0/synaptics_tcm.0/wakeup u:object_r:sysfs_wakeup:s0
|
||||||
genfscon sysfs /devices/platform/111d0000.spi/spi_master/spi20/spi20.0/synaptics_tcm.0/sysfs u:object_r:sysfs_touch:s0
|
genfscon sysfs /devices/platform/111d0000.spi/spi_master/spi20/spi20.0/synaptics_tcm.0/sysfs u:object_r:sysfs_touch:s0
|
||||||
genfscon sysfs /devices/platform/111d0000.spi/spi_master/spi20/spi20.0/synaptics_tcm.0/wakeup u:object_r:sysfs_wakeup:s0
|
genfscon sysfs /devices/platform/111d0000.spi/spi_master/spi20/spi20.0/synaptics_tcm.0/wakeup u:object_r:sysfs_wakeup:s0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
PRODUCT_VENDOR_PROPERTIES += ro.vendor.touch.dump.sys=/sys/devices/platform/10d10000.spi/spi_master/spi0/spi0.0/synaptics_tcm.0/sysfs
|
PRODUCT_VENDOR_PROPERTIES += ro.vendor.touch.dump.sys=/sys/class/spi_master/spi0/spi0.0/synaptics_tcm.0/sysfs
|
||||||
|
|
||||||
BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/touch/syna/sepolicy
|
BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/touch/syna/sepolicy
|
||||||
|
|
||||||
|
|
5
touch/syna/syna19.mk
Normal file
5
touch/syna/syna19.mk
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
PRODUCT_VENDOR_PROPERTIES += ro.vendor.touch.dump.sys=/sys/class/spi_master/spi19/spi19.0/synaptics_tcm.0/sysfs
|
||||||
|
|
||||||
|
BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/touch/syna/sepolicy
|
||||||
|
|
||||||
|
PRODUCT_PACKAGES += dump_syna.sh
|
|
@ -1,4 +1,4 @@
|
||||||
PRODUCT_VENDOR_PROPERTIES += ro.vendor.touch.dump.sys=/sys/devices/platform/111d0000.spi/spi_master/spi20/spi20.0/synaptics_tcm.0/sysfs
|
PRODUCT_VENDOR_PROPERTIES += ro.vendor.touch.dump.sys=/sys/class/spi_master/spi20/spi20.0/synaptics_tcm.0/sysfs
|
||||||
|
|
||||||
BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/touch/syna/sepolicy
|
BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/touch/syna/sepolicy
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue