BOBtheBlinker/android_device_oneplus_dre
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sm8350-common: Adjust for recent tri state key changes

Browse source 
tri-state-key package has been integrated into KeyHandler app, and
KeyHandler itself no longer needs to be added to lineage-sdk overlays.

Change-Id: I13b8f05e8e0b036c9303a01ec0c7e2d99b6756f7
This commit is contained in:
LuK1337 2021-10-20 19:39:29 +02:00
parent 34972ef817
commit 0885f34c01
8 changed files with 29 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
BoardConfigCommon.mk
View file

@ -197,6 +197,7 @@ VENDOR_SECURITY_PATCH := 2021-09-01
# Sepolicy # Sepolicy
include device/qcom/sepolicy_vndr/SEPolicy.mk include device/qcom/sepolicy_vndr/SEPolicy.mk
BOARD_PLAT_PRIVATE_SEPOLICY_DIR += $(COMMON_PATH)/sepolicy/private
BOARD_SEPOLICY_DIRS += $(COMMON_PATH)/sepolicy/vendor BOARD_SEPOLICY_DIRS += $(COMMON_PATH)/sepolicy/vendor
# Verified Boot # Verified Boot

2
common.mk
View file

@ -469,7 +469,7 @@ PRODUCT_PACKAGES += \
# tri-state-key # tri-state-key
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
KeyHandler \ KeyHandler \
tri-state-key_daemon.vendor tri-state-key-calibrate
# Trust HAL # Trust HAL
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \

12
overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml
View file

@ -22,18 +22,6 @@
<integer name="config_proximityCheckTimeout">100</integer> <integer name="config_proximityCheckTimeout">100</integer>
<bool name="config_proximityCheckOnWakeEnabledByDefault">true</bool> <bool name="config_proximityCheckOnWakeEnabledByDefault">true</bool>
<!-- Paths to the libraries that contain device specific key handlers -->
<string-array name="config_deviceKeyHandlerLibs" translatable="false">
<item>/system/priv-app/LineageParts/LineageParts.apk</item>
<item>/system_ext/app/KeyHandler/KeyHandler.apk</item>
</string-array>
<!-- Names of the key handler classes -->
<string-array name="config_deviceKeyHandlerClasses" translatable="false">
<item>org.lineageos.lineageparts.gestures.KeyHandler</item>
<item>org.lineageos.settings.device.KeyHandler</item>
</string-array>
<!-- Hardware keys present on the device, stored as a bit field. <!-- Hardware keys present on the device, stored as a bit field.
This integer should equal the sum of the corresponding value for each This integer should equal the sum of the corresponding value for each
of the following keys present: of the following keys present:

10
sepolicy/private/keyhandler_app.te Normal file
View file

@ -0,0 +1,10 @@
type keyhandler_app, domain;
app_domain(keyhandler_app)
allow keyhandler_app self:netlink_kobject_uevent_socket { read bind setopt create };
allow keyhandler_app app_api_service:service_manager find;
allow keyhandler_app system_app_data_file:dir create_dir_perms;
allow keyhandler_app system_app_data_file:{ file lnk_file } create_file_perms;

1
sepolicy/private/seapp_contexts Normal file
View file

@ -0,0 +1 @@
user=system seinfo=platform name=org.lineageos.settings.device domain=keyhandler_app type=system_app_data_file

6
sepolicy/vendor/file_contexts vendored
View file

@ -1,7 +1,7 @@
# Binaries # Binaries
/(vendor|system/vendor)/bin/opf-service u:object_r:opf_exec:s0 /(vendor|system/vendor)/bin/opf-service u:object_r:opf_exec:s0
/(vendor|system/vendor)/bin/tri-state-key_daemon u:object_r:tri-state-key_daemon_exec:s0 /(vendor|system/vendor)/bin/tri-state-key-calibrate u:object_r:tri-state-key-calibrate_exec:s0
/(vendor|system/vendor)/bin/wifi-mac-generator u:object_r:wifi-mac-generator_exec:s0 /(vendor|system/vendor)/bin/wifi-mac-generator u:object_r:wifi-mac-generator_exec:s0
# Block devices # Block devices
/dev/block/platform/soc/1d84000\.ufshc/by-name/oplus_sec_[ab] u:object_r:vendor_custom_ab_block_device:s0 /dev/block/platform/soc/1d84000\.ufshc/by-name/oplus_sec_[ab] u:object_r:vendor_custom_ab_block_device:s0

13
sepolicy/vendor/tri-state-key-calibrate.te vendored Normal file
View file

@ -0,0 +1,13 @@
type tri-state-key-calibrate, domain;
type tri-state-key-calibrate_exec, exec_type, vendor_file_type, file_type;
init_daemon_domain(tri-state-key-calibrate)
allow tri-state-key-calibrate vendor_shell_exec:file rx_file_perms;
allow tri-state-key-calibrate vendor_toolbox_exec:file rx_file_perms;
allow tri-state-key-calibrate sysfs_tri_state_key:file w_file_perms;
allow tri-state-key-calibrate mnt_vendor_file:dir search;
r_dir_file(tri-state-key-calibrate, oem_file)

13
sepolicy/vendor/tri-state-key_daemon.te vendored
View file

@ -1,13 +0,0 @@
type tri-state-key_daemon, domain;
type tri-state-key_daemon_exec, vendor_file_type, exec_type, file_type;
init_daemon_domain(tri-state-key_daemon)
allow tri-state-key_daemon uhid_device:chr_file rw_file_perms;
allow tri-state-key_daemon self:netlink_kobject_uevent_socket create_socket_perms_no_ioctl;
allow tri-state-key_daemon sysfs_tri_state_key:file w_file_perms;
allow tri-state-key_daemon mnt_vendor_file:dir search;
r_dir_file(tri-state-key_daemon, oem_file)