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

Commit f9872c73 authored by LuK1337's avatar LuK1337
Browse files

sm8150-common: Adjust for recent tri state key changes 

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
parent fcdeae90

common.mk

+1 −1
Original line number Diff line number Diff line
@@ -425,7 +425,7 @@ PRODUCT_PACKAGES += \ 
# tri-state key

PRODUCT_PACKAGES += \

    KeyHandler \

    tri-state-key_daemon.vendor

    tri-state-key-calibrate



# Trust HAL

PRODUCT_PACKAGES += \

overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml

+0 −2
Original line number Diff line number Diff line
@@ -19,14 +19,12 @@ 
    <!-- 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>

        <item>/system/priv-app/OnePlusCameraHelper/OnePlusCameraHelper.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>

        <item>org.lineageos.camerahelper.KeyHandler</item>

    </string-array>

sepolicy/private/keyhandler_app.te

0 → 100644
+12 −0
Original line number Diff line number Diff line 
type keyhandler_app, domain;



app_domain(keyhandler_app)



allow keyhandler_app self:netlink_kobject_uevent_socket { read bind setopt create };



# Allow keyhandler_app to find app_api_service

allow keyhandler_app app_api_service:service_manager find;



# Allow keyhandler_app read and write /data/data subdirectory

allow keyhandler_app system_app_data_file:dir create_dir_perms;

allow keyhandler_app system_app_data_file:{ file lnk_file } create_file_perms;

sepolicy/private/seapp_contexts

+1 −0
Original line number Diff line number Diff line 
user=system seinfo=platform name=org.lineageos.camerahelper domain=camera_helper_app type=system_app_data_file

user=system seinfo=platform name=org.lineageos.settings.device domain=keyhandler_app type=system_app_data_file

sepolicy/vendor/file_contexts

+5 −5
Original line number Diff line number Diff line 
# Binaries

/(vendor|system/vendor)/bin/dashd                      u:object_r:dashd_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/vl53l1_daemon_main         u:object_r:vl53l1_daemon_main_exec:s0

/(vendor|system/vendor)/bin/wifi-mac-generator         u:object_r:wifi-mac-generator_exec:s0