From 55d26d60caa8fdfe67521cd9cedb57efda3c0706 Mon Sep 17 00:00:00 2001 From: TARKZiM Date: Sat, 17 Apr 2021 14:29:12 +0800 Subject: [PATCH 01/14] kitakami-common: Add BCM FM repo to lineage.dependencies Change-Id: Ibb64b03334a5ad89cfcd8d5ea483d3ee171f2ff3 --- lineage.dependencies | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lineage.dependencies b/lineage.dependencies index 2009d9e..880ca01 100644 --- a/lineage.dependencies +++ b/lineage.dependencies @@ -1,4 +1,8 @@ [ + { + "repository": "android_hardware_broadcom_fm", + "target_path": "hardware/broadcom/fm" + }, { "repository": "android_hardware_sony_timekeep", "target_path": "hardware/sony/timekeep" -- GitLab From 8403696af3e4e9c18b59fb591ebff49964c677a8 Mon Sep 17 00:00:00 2001 From: Erfan Abdi Date: Wed, 4 Sep 2019 17:50:41 +0430 Subject: [PATCH 02/14] kitakami-common: Setup device soong namespace Change-Id: I2e9c0ab68a0fe86ba18e3955e2823b87d88e835a Signed-off-by: Erfan Abdi --- Android.bp | 3 +++ device-common.mk | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/Android.bp b/Android.bp index f61e31b..3e40d60 100644 --- a/Android.bp +++ b/Android.bp @@ -1,3 +1,6 @@ +soong_namespace { +} + subdirs = [ "light", ] diff --git a/device-common.mk b/device-common.mk index fd5c694..685dcfd 100644 --- a/device-common.mk +++ b/device-common.mk @@ -312,6 +312,10 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ camera.qcom_shim +# Soong +PRODUCT_SOONG_NAMESPACES += \ + device/sony/kitakami-common + # TimeKeep PRODUCT_PACKAGES += \ timekeep \ -- GitLab From 454abcf8e3023b034d3785714d05fedcac48e3b8 Mon Sep 17 00:00:00 2001 From: Bernhard Thoben Date: Fri, 30 Apr 2021 11:03:29 +0200 Subject: [PATCH 03/14] kitakami-common: Switched to globally used variables. Change-Id: I7f686236b067e4bd797672cc9f1c5a13f5b1df5b --- device-common.mk | 32 ++++++++++++++++---------------- radio.mk | 4 ++-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/device-common.mk b/device-common.mk index 685dcfd..7352dcc 100644 --- a/device-common.mk +++ b/device-common.mk @@ -1,6 +1,6 @@ # # Copyright (C) 2016 The CyanogenMod Project -# Copyright (C) 2017-2020 The LineageOS Project +# Copyright (C) 2017-2021 The LineageOS Project # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -120,7 +120,7 @@ PRODUCT_COPY_FILES += \ # Bluetooth PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/bluetooth/bt_vendor.conf:system/etc/bluetooth/bt_vendor.conf + $(LOCAL_PATH)/bluetooth/bt_vendor.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/bluetooth/bt_vendor.conf PRODUCT_PACKAGES += \ android.hardware.bluetooth@1.0-impl \ @@ -188,17 +188,17 @@ PRODUCT_PACKAGES += \ libshim_gps PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/gps/flp.conf:system/etc/flp.conf \ - $(LOCAL_PATH)/gps/gps.conf:system/etc/gps.conf \ - $(LOCAL_PATH)/gps/izat.conf:system/etc/izat.conf \ - $(LOCAL_PATH)/gps/sap.conf:system/etc/sap.conf + $(LOCAL_PATH)/gps/flp.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/flp.conf \ + $(LOCAL_PATH)/gps/gps.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/gps.conf \ + $(LOCAL_PATH)/gps/izat.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/izat.conf \ + $(LOCAL_PATH)/gps/sap.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/sap.conf PRODUCT_PACKAGES += \ android.hardware.gnss@1.0-impl # Flash LED config PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/configs/flashled_calc_parameters.cfg:system/etc/flashled_calc_parameters.cfg + $(LOCAL_PATH)/configs/flashled_calc_parameters.cfg:$(TARGET_COPY_OUT_SYSTEM)/etc/flashled_calc_parameters.cfg # Health PRODUCT_PACKAGES += \ @@ -206,18 +206,18 @@ PRODUCT_PACKAGES += \ # Init PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/rootdir/fstab.qcom:root/fstab.qcom \ - $(LOCAL_PATH)/rootdir/init.qcom.usb.rc:root/init.qcom.usb.rc \ - $(LOCAL_PATH)/rootdir/init.qcom.rc:root/init.qcom.rc \ - $(LOCAL_PATH)/rootdir/ueventd.qcom.rc:root/ueventd.qcom.rc + $(LOCAL_PATH)/rootdir/fstab.qcom:$(TARGET_COPY_OUT_ROOT)/fstab.qcom \ + $(LOCAL_PATH)/rootdir/init.qcom.usb.rc:$(TARGET_COPY_OUT_ROOT)/init.qcom.usb.rc \ + $(LOCAL_PATH)/rootdir/init.qcom.rc:$(TARGET_COPY_OUT_ROOT)/init.qcom.rc \ + $(LOCAL_PATH)/rootdir/ueventd.qcom.rc:$(TARGET_COPY_OUT_ROOT)/ueventd.qcom.rc # Input PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/keylayout/clearpad.kl:system/usr/keylayout/clearpad.kl \ - $(LOCAL_PATH)/keylayout/gpio-keys.kl:system/usr/keylayout/gpio-keys.kl \ - $(LOCAL_PATH)/keylayout/mhl-rcp.kl:system/usr/keylayout/mhl-rcp.kl \ - $(LOCAL_PATH)/keylayout/msm8994-tomtom-snd-card_Button_Jack.kl:system/usr/keylayout/msm8994-tomtom-snd-card_Button_Jack.kl \ - $(LOCAL_PATH)/keylayout/synaptics_dsx.kl:system/usr/keylayout/synaptics_dsx.kl + $(LOCAL_PATH)/keylayout/clearpad.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/clearpad.kl \ + $(LOCAL_PATH)/keylayout/gpio-keys.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/gpio-keys.kl \ + $(LOCAL_PATH)/keylayout/mhl-rcp.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/mhl-rcp.kl \ + $(LOCAL_PATH)/keylayout/msm8994-tomtom-snd-card_Button_Jack.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/msm8994-tomtom-snd-card_Button_Jack.kl \ + $(LOCAL_PATH)/keylayout/synaptics_dsx.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/synaptics_dsx.kl # IRQ PRODUCT_COPY_FILES += \ diff --git a/radio.mk b/radio.mk index 23d3aa0..b8d7905 100644 --- a/radio.mk +++ b/radio.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2017 The LineageOS Project +# Copyright (C) 2017-2021 The LineageOS Project # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ # Permissions PRODUCT_COPY_FILES += \ - frameworks/native/data/etc/android.hardware.telephony.gsm.xml:system/etc/permissions/android.hardware.telephony.gsm.xml + frameworks/native/data/etc/android.hardware.telephony.gsm.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/android.hardware.telephony.gsm.xml # Properties PRODUCT_PROPERTY_OVERRIDES += \ -- GitLab From c1ca61993af9551675745b979caeed706bd0d7f3 Mon Sep 17 00:00:00 2001 From: Bernhard Thoben Date: Wed, 6 Jan 2021 14:51:03 +0100 Subject: [PATCH 04/14] kitakami-common: sepolicy: Addressing DRM denials. Change-Id: Id9e0245c67f013b42a1b7bae60c082c67e3ba1af --- sepolicy/vendor/hal_drm_clearkey.te | 1 + sepolicy/vendor/hal_drm_widevine.te | 2 ++ sepolicy/vendor/mediadrmserver.te | 1 + 3 files changed, 4 insertions(+) create mode 100644 sepolicy/vendor/hal_drm_widevine.te create mode 100644 sepolicy/vendor/mediadrmserver.te diff --git a/sepolicy/vendor/hal_drm_clearkey.te b/sepolicy/vendor/hal_drm_clearkey.te index 286e248..bae05ce 100644 --- a/sepolicy/vendor/hal_drm_clearkey.te +++ b/sepolicy/vendor/hal_drm_clearkey.te @@ -8,3 +8,4 @@ allow hal_drm_clearkey hal_drm_hwservice:hwservice_manager { add find }; allow hal_drm_clearkey hidl_base_hwservice:hwservice_manager add; allow hal_drm_clearkey hwservicemanager:binder { call transfer }; allow hal_drm_clearkey hwservicemanager_prop:file r_file_perms; +allow hal_drm_clearkey mediadrmserver:binder { call transfer }; diff --git a/sepolicy/vendor/hal_drm_widevine.te b/sepolicy/vendor/hal_drm_widevine.te new file mode 100644 index 0000000..d558dec --- /dev/null +++ b/sepolicy/vendor/hal_drm_widevine.te @@ -0,0 +1,2 @@ +allow hal_drm_widevine vendor_data_file:dir create_dir_perms; +allow hal_drm_widevine vendor_data_file:file create_file_perms; diff --git a/sepolicy/vendor/mediadrmserver.te b/sepolicy/vendor/mediadrmserver.te new file mode 100644 index 0000000..5da38e7 --- /dev/null +++ b/sepolicy/vendor/mediadrmserver.te @@ -0,0 +1 @@ +allow mediadrmserver hal_drm_clearkey:binder { call transfer }; -- GitLab From 33372d66ab67fdeec1d3447992dcaa53c1668c14 Mon Sep 17 00:00:00 2001 From: Bernhard Thoben Date: Thu, 7 Jan 2021 17:06:21 +0100 Subject: [PATCH 05/14] kitakami-common: sepolicy: Changed DRM addressing. Change-Id: I23f8926da2f9c11512955d4c48c3132fdc99c7da --- sepolicy/vendor/file.te | 1 + sepolicy/vendor/file_contexts | 1 + sepolicy/vendor/hal_drm_widevine.te | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sepolicy/vendor/file.te b/sepolicy/vendor/file.te index 1111362..2c8f772 100644 --- a/sepolicy/vendor/file.te +++ b/sepolicy/vendor/file.te @@ -1,5 +1,6 @@ type brcm_ldisc_sysfs, sysfs_type, fs_type; type fpc_data_file, file_type; +type mediadrm_vendor_data_file, file_type, data_file_type; type proc_kernel_sched, fs_type; type secd_data_file, file_type; type secd_socket, file_type; diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts index b1b988e..6b6799f 100644 --- a/sepolicy/vendor/file_contexts +++ b/sepolicy/vendor/file_contexts @@ -20,6 +20,7 @@ /sys/devices(/soc\.0)?/bcmdhd_wlan.83/macaddr u:object_r:sysfs_addrsetup:s0 # DRM +/data/vendor/mediadrm(/.*)? u:object_r:mediadrm_vendor_data_file:s0 /(vendor|system/vendor)/bin/hw/android\.hardware\.drm@1\.2-service.clearkey u:object_r:hal_drm_clearkey_exec:s0 /(vendor|system/vendor)/bin/hw/android\.hardware\.drm@1\.1-service.widevine u:object_r:hal_drm_widevine_exec:s0 diff --git a/sepolicy/vendor/hal_drm_widevine.te b/sepolicy/vendor/hal_drm_widevine.te index d558dec..120a9ec 100644 --- a/sepolicy/vendor/hal_drm_widevine.te +++ b/sepolicy/vendor/hal_drm_widevine.te @@ -1,2 +1,2 @@ -allow hal_drm_widevine vendor_data_file:dir create_dir_perms; -allow hal_drm_widevine vendor_data_file:file create_file_perms; +allow hal_drm_widevine mediadrm_vendor_data_file:dir create_dir_perms; +allow hal_drm_widevine mediadrm_vendor_data_file:file create_file_perms; -- GitLab From dad018c8167192ff4ef51d2b8812c0b8ff899a64 Mon Sep 17 00:00:00 2001 From: Bernhard Thoben Date: Mon, 29 Mar 2021 18:57:43 +0200 Subject: [PATCH 06/14] kitakami-common: sepolicy: Added wildcards to DRM HAL properties. Change-Id: Ie1e7600f0fbbda19e20b499c3f1b347dfd9413cd --- sepolicy/vendor/file_contexts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts index 6b6799f..80aa7cd 100644 --- a/sepolicy/vendor/file_contexts +++ b/sepolicy/vendor/file_contexts @@ -21,8 +21,8 @@ # DRM /data/vendor/mediadrm(/.*)? u:object_r:mediadrm_vendor_data_file:s0 -/(vendor|system/vendor)/bin/hw/android\.hardware\.drm@1\.2-service.clearkey u:object_r:hal_drm_clearkey_exec:s0 -/(vendor|system/vendor)/bin/hw/android\.hardware\.drm@1\.1-service.widevine u:object_r:hal_drm_widevine_exec:s0 +/(vendor|system/vendor)/bin/hw/android\.hardware\.drm@1\.[0-9]-service.clearkey u:object_r:hal_drm_clearkey_exec:s0 +/(vendor|system/vendor)/bin/hw/android\.hardware\.drm@1\.[0-9]-service.widevine u:object_r:hal_drm_widevine_exec:s0 # BRCM BT FM /sys/bus/platform/drivers/bcm_ldisc/bcmbt_ldisc(/.*)? u:object_r:brcm_ldisc_sysfs:s0 -- GitLab From b00fac75b3872d8e3f4fe7b6dbe29be26a1733d2 Mon Sep 17 00:00:00 2001 From: Bernhard Thoben Date: Sun, 11 Jul 2021 14:24:47 +0200 Subject: [PATCH 07/14] kitakami-common: overlay: Disable WPA2 -> WPA3 upgrade. Our device doesn't simply support sae. Change-Id: Id01d84afeeb12f4874638e8125f79ea360c0dc58 --- overlay/frameworks/base/core/res/res/values/config.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index b25c366..37c64fa 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -301,6 +301,9 @@ rmem_min,rmem_def,rmem_max,wmem_min,wmem_def,wmem_max --> 524288,2097152,4194304,262144,524288,1048576 + + false + com.google.android.gms/com.google.android.gms.nearby.messages.service.NearbyMessagesService -- GitLab From e49c13a4e8c389ddf9844d15699b1fa9bbadc42a Mon Sep 17 00:00:00 2001 From: Bernhard Thoben Date: Wed, 24 Mar 2021 22:12:37 +0100 Subject: [PATCH 08/14] kitakami-common: Changed the wifi modules name. - This matches the latest changes in kernel. Change-Id: Ib8f1a2b9f8b473b835911c7b3aa7eea602518302 --- BoardConfigCommon.mk | 2 +- rootdir/init.qcom.rc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 5aba7ff..1274072 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -209,7 +209,7 @@ BOARD_WPA_SUPPLICANT_DRIVER := NL80211 BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_$(BOARD_WLAN_DEVICE) BOARD_HOSTAPD_DRIVER := NL80211 BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_$(BOARD_WLAN_DEVICE) -WIFI_DRIVER_FW_PATH_PARAM := "/sys/module/bcmdhd/parameters/firmware_path" +WIFI_DRIVER_FW_PATH_PARAM := "/sys/module/wlan/parameters/firmware_path" WIFI_DRIVER_FW_PATH_AP := "/system/etc/firmware/wlan/bcmdhd/fw_bcmdhd_apsta.bin" WIFI_DRIVER_FW_PATH_STA := "/system/etc/firmware/wlan/bcmdhd/fw_bcmdhd.bin" WPA_SUPPLICANT_VERSION := VER_0_8_X diff --git a/rootdir/init.qcom.rc b/rootdir/init.qcom.rc index 6a03677..3be409d 100644 --- a/rootdir/init.qcom.rc +++ b/rootdir/init.qcom.rc @@ -463,7 +463,7 @@ on post-fs-data chown system system /sys/module/qpnp_smbcharger_extension/parameters/id_polling_state # Wifi firmware reload path - chown wifi wifi /sys/module/bcmdhd/parameters/firmware_path + chown wifi wifi /sys/module/wlan/parameters/firmware_path setprop vold.post_fs_data_done 1 -- GitLab From 9f263749870554af20fd09a0d9916f075b230500 Mon Sep 17 00:00:00 2001 From: Bernhard Thoben Date: Fri, 19 Feb 2021 18:29:55 +0100 Subject: [PATCH 09/14] kitakami-common: rootdir: There is no service dhcpcd at all. Change-Id: Ic0b984d2e2efe9fa07b2dcb6565a46c9d39b2336 --- rootdir/init.qcom.rc | 3 --- 1 file changed, 3 deletions(-) diff --git a/rootdir/init.qcom.rc b/rootdir/init.qcom.rc index 3be409d..d47b6ae 100644 --- a/rootdir/init.qcom.rc +++ b/rootdir/init.qcom.rc @@ -467,9 +467,6 @@ on post-fs-data setprop vold.post_fs_data_done 1 -on property:init.svc.wpa_supplicant=stopped - stop dhcpcd - service irsc_util /system/bin/irsc_util "/etc/sec_config" class main user root -- GitLab From dafef5bceeb641621c0d6f96825fd08607512672 Mon Sep 17 00:00:00 2001 From: Bernhard Thoben Date: Sun, 18 Apr 2021 18:41:41 +0200 Subject: [PATCH 10/14] kitakami-common: Using CPU variant "cortex-a53" instead of "generic". Change-Id: Ifc823d3addb08afca9cf06c24c79bb5fa58c9dd6 --- BoardConfigCommon.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 1274072..7e3f249 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -34,13 +34,13 @@ TARGET_ARCH := arm64 TARGET_ARCH_VARIANT := armv8-a TARGET_CPU_ABI := arm64-v8a TARGET_CPU_ABI2 := -TARGET_CPU_VARIANT := generic +TARGET_CPU_VARIANT := cortex-a53 TARGET_2ND_ARCH := arm TARGET_2ND_ARCH_VARIANT := armv8-a TARGET_2ND_CPU_ABI := armeabi-v7a TARGET_2ND_CPU_ABI2 := armeabi -TARGET_2ND_CPU_VARIANT := generic +TARGET_2ND_CPU_VARIANT := cortex-a53 TARGET_2ND_CPU_VARIANT_RUNTIME := cortex-a53 TARGET_USES_64_BIT_BINDER := true -- GitLab From 1b7e59b29b0d822043e4b0ad41896262116a99d5 Mon Sep 17 00:00:00 2001 From: Bernhard Thoben Date: Thu, 29 Apr 2021 12:39:15 +0200 Subject: [PATCH 11/14] kitakami-common: audio: Changed file audio_effects.xml to reduce echo in phone calls. Change-Id: I98d3a70aa3c277cdc94c2dbb0fc41d1b39876da1 --- audio/audio_effects.xml | 58 +++++++++++++++++++++++++++-------------- 1 file changed, 39 insertions(+), 19 deletions(-) diff --git a/audio/audio_effects.xml b/audio/audio_effects.xml index 3b87058..ced294b 100644 --- a/audio/audio_effects.xml +++ b/audio/audio_effects.xml @@ -3,31 +3,51 @@ - + + - - - - + + + - - - + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - + + -- GitLab From d21521d5a58eae75b99b40583b7b4ee815580696 Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Mon, 29 Jan 2018 00:55:25 +0100 Subject: [PATCH 12/14] kitakami-common: audio: Disable ULL mode * Ultra low latency playback is currently broken. Crackling audio can be well noticed while playing WhatsApp audio messages or even during some games. * This patch routes all audio that normally used audio-ull-playback paths to low-latency-playback paths instead, thus meaning we're switching from ULL to LL mode. Change-Id: I1f029d7df9a306f411598b0cffc536409cb2ae95 --- audio/audio_policy_configuration.xml | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/audio/audio_policy_configuration.xml b/audio/audio_policy_configuration.xml index 32908bb..c89bc36 100644 --- a/audio/audio_policy_configuration.xml +++ b/audio/audio_policy_configuration.xml @@ -63,10 +63,6 @@ - - - + sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx,BT SCO Headset Mic"/> + sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx,BT SCO Headset Mic,Telephony Rx"/> + sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx,BT SCO Headset Mic,Telephony Rx"/> + sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx,BT SCO Headset Mic,Telephony Rx"/> + sources="primary output,deep_buffer,direct_pcm,compressed_offload"/> + sources="primary output,deep_buffer,direct_pcm,compressed_offload"/> + sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx"/> + sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx"/> + sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx"/> Date: Thu, 30 Sep 2021 11:50:29 +0200 Subject: [PATCH 13/14] kitakami-common: sepolicy: A few little changes. Change-Id: I23d1c60712228b6d1f945c8b820ab0f952ef9b03 --- sepolicy/vendor/charger.te | 2 +- sepolicy/vendor/hal_fingerprint_default.te | 1 - sepolicy/vendor/init-power-sh.te | 1 + sepolicy/vendor/init.te | 2 +- sepolicy/vendor/loc_launcher.te | 1 + sepolicy/vendor/mlog_qmi_service.te | 1 - sepolicy/vendor/rild.te | 1 - sepolicy/vendor/sensors.te | 2 +- sepolicy/vendor/timekeep.te | 8 ++++---- 9 files changed, 9 insertions(+), 10 deletions(-) diff --git a/sepolicy/vendor/charger.te b/sepolicy/vendor/charger.te index f15938b..fbeca80 100644 --- a/sepolicy/vendor/charger.te +++ b/sepolicy/vendor/charger.te @@ -1,5 +1,5 @@ allow charger device:dir r_dir_perms; allow charger self:capability { dac_override dac_read_search }; allow charger sysfs_battery_supply:file r_file_perms; -allow charger sysfs:file { open read getattr }; +allow charger sysfs:file r_file_perms; allow charger sysfs_usb_supply:file r_file_perms; diff --git a/sepolicy/vendor/hal_fingerprint_default.te b/sepolicy/vendor/hal_fingerprint_default.te index 355eec6..26f89e2 100644 --- a/sepolicy/vendor/hal_fingerprint_default.te +++ b/sepolicy/vendor/hal_fingerprint_default.te @@ -16,5 +16,4 @@ allow hal_fingerprint_default sysfs_battery_supply:dir search; allow hal_fingerprint_default sysfs_battery_supply:file r_file_perms; allow hal_fingerprint_default system_data_file:dir create_dir_perms; allow hal_fingerprint_default system_data_file:sock_file create_file_perms; -allow hal_fingerprint_default tee_device:chr_file ioctl; allow hal_fingerprint_default tee_device:chr_file rw_file_perms; diff --git a/sepolicy/vendor/init-power-sh.te b/sepolicy/vendor/init-power-sh.te index c3df56f..088fdb7 100644 --- a/sepolicy/vendor/init-power-sh.te +++ b/sepolicy/vendor/init-power-sh.te @@ -1,3 +1,4 @@ +# init-power-sh service type init-power-sh, domain; type init-power-sh_exec, exec_type, file_type; diff --git a/sepolicy/vendor/init.te b/sepolicy/vendor/init.te index 043036a..39a7c31 100644 --- a/sepolicy/vendor/init.te +++ b/sepolicy/vendor/init.te @@ -2,7 +2,7 @@ allow init block_device:blk_file setattr; allow init cameraserver:fd use; allow init debugfs:file w_file_perms; allow init diag_data_file:dir mounton; -allow init diag_data_file:file { lock rename }; +allow init diag_data_file:file create_file_perms; allow init diag_data_file:sock_file write; allow init fingerprintd_data_file:file rename; allow init hal_drm_hwservice:hwservice_manager add; diff --git a/sepolicy/vendor/loc_launcher.te b/sepolicy/vendor/loc_launcher.te index 9f6fe93..4078ff8 100644 --- a/sepolicy/vendor/loc_launcher.te +++ b/sepolicy/vendor/loc_launcher.te @@ -2,6 +2,7 @@ type loc_launcher, domain; type loc_launcher_exec, exec_type, file_type; +# Started by init init_daemon_domain(loc_launcher) allow loc_launcher location_data_file:dir rw_dir_perms; diff --git a/sepolicy/vendor/mlog_qmi_service.te b/sepolicy/vendor/mlog_qmi_service.te index d097f59..d03d382 100644 --- a/sepolicy/vendor/mlog_qmi_service.te +++ b/sepolicy/vendor/mlog_qmi_service.te @@ -7,7 +7,6 @@ init_daemon_domain(mlog_qmi_service) # Allow mlog_qmi_service to create self:socket allow mlog_qmi_service self:socket create_socket_perms; -allow mlog_qmi_service self:socket { create read write }; allowxperm mlog_qmi_service self:socket ioctl msm_sock_ipc_ioctls; # Allow mlog_qmi_service to use net_raw capability diff --git a/sepolicy/vendor/rild.te b/sepolicy/vendor/rild.te index f845b64..5c87aef 100644 --- a/sepolicy/vendor/rild.te +++ b/sepolicy/vendor/rild.te @@ -15,6 +15,5 @@ allow rild servicemanager:binder call; allow rild socket_device:sock_file write; allow rild tad_socket:sock_file write; allow rild tad:unix_stream_socket connectto; -allow rild tee_device:chr_file ioctl; allow rild tee_device:chr_file rw_file_perms; allow rild vendor_file:file ioctl; diff --git a/sepolicy/vendor/sensors.te b/sepolicy/vendor/sensors.te index 379d177..648f853 100644 --- a/sepolicy/vendor/sensors.te +++ b/sepolicy/vendor/sensors.te @@ -2,5 +2,5 @@ allow sensors device:dir w_dir_perms; allow sensors input_device:chr_file { relabelfrom getattr link }; allow sensors input_device:dir search; allow sensors sysfs:file r_file_perms; -allow sensors tad_socket:sock_file { write }; +allow sensors tad_socket:sock_file write; allow sensors tmpfs:file rw_file_perms; diff --git a/sepolicy/vendor/timekeep.te b/sepolicy/vendor/timekeep.te index ab13d0f..52a97d8 100644 --- a/sepolicy/vendor/timekeep.te +++ b/sepolicy/vendor/timekeep.te @@ -16,9 +16,9 @@ allow timekeep self:capability { dac_override dac_read_search }; -allow timekeep timekeep_data_file:file create_file_perms; -allow timekeep timekeep_data_file:dir create_dir_perms; -allow timekeep time_data_file:dir create_dir_perms; -allow timekeep time_data_file:file create_file_perms; allow timekeep sysfs:file r_file_perms; allow timekeep sysfs_rtc:dir search; +allow timekeep time_data_file:dir create_dir_perms; +allow timekeep time_data_file:file create_file_perms; +allow timekeep timekeep_data_file:dir create_dir_perms; +allow timekeep timekeep_data_file:file create_file_perms; -- GitLab From 2263628bb867aaa01effb6248e373594400ecf35 Mon Sep 17 00:00:00 2001 From: Bernhard Thoben Date: Fri, 5 Mar 2021 17:14:15 +0100 Subject: [PATCH 14/14] kitakami-common: rootdir: Added "/misc" partition to enable "Reboot into recovery". * Thanks to user sabarop. Change-Id: I7540bf76262cf8acbf9eb2be7b7d60e121f2797e --- rootdir/fstab.qcom | 1 + 1 file changed, 1 insertion(+) diff --git a/rootdir/fstab.qcom b/rootdir/fstab.qcom index 1567ff3..55bed1b 100644 --- a/rootdir/fstab.qcom +++ b/rootdir/fstab.qcom @@ -8,6 +8,7 @@ /dev/block/bootdevice/by-name/system /system ext4 ro,barrier=1 wait,recoveryonly /dev/block/bootdevice/by-name/userdata /data ext4 nosuid,nodev,barrier=1 wait,encryptable=footer,length=-16384 /dev/block/bootdevice/by-name/cache /cache ext4 nosuid,nodev,barrier=1 wait +/dev/block/bootdevice/by-name/misc /misc emmc defaults defaults /dev/block/bootdevice/by-name/modem /firmware vfat ro,shortname=lower,uid=1000,gid=1000,dmask=222,fmask=222 wait /dev/block/bootdevice/by-name/persist /persist ext4 nosuid,nodev,barrier=1,data=ordered,nodelalloc,nomblk_io_submit,errors=panic wait,notrim /dev/block/bootdevice/by-name/config /persistent emmc defaults defaults -- GitLab