From 1e208267f26696323da86167efbb8333e188732c Mon Sep 17 00:00:00 2001 From: Pete Fotheringham Date: Tue, 12 Oct 2021 13:53:13 +0000 Subject: [PATCH] Revert "Merge branch '3866-suzuran-upstream-l17-changes' into 'v1-q'" This reverts merge request !2 --- Android.bp | 3 - BoardConfigCommon.mk | 6 +- audio/audio_effects.xml | 58 ++++++------------- audio/audio_policy_configuration.xml | 22 ++++--- device-common.mk | 36 +++++------- lineage.dependencies | 4 -- .../base/core/res/res/values/config.xml | 3 - radio.mk | 4 +- rootdir/fstab.qcom | 1 - rootdir/init.qcom.rc | 5 +- sepolicy/vendor/charger.te | 2 +- sepolicy/vendor/file.te | 1 - sepolicy/vendor/file_contexts | 5 +- sepolicy/vendor/hal_drm_clearkey.te | 1 - sepolicy/vendor/hal_drm_widevine.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/mediadrmserver.te | 1 - sepolicy/vendor/mlog_qmi_service.te | 1 + sepolicy/vendor/rild.te | 1 + sepolicy/vendor/sensors.te | 2 +- sepolicy/vendor/timekeep.te | 8 +-- 24 files changed, 69 insertions(+), 102 deletions(-) delete mode 100644 sepolicy/vendor/hal_drm_widevine.te delete mode 100644 sepolicy/vendor/mediadrmserver.te diff --git a/Android.bp b/Android.bp index 3e40d60..f61e31b 100644 --- a/Android.bp +++ b/Android.bp @@ -1,6 +1,3 @@ -soong_namespace { -} - subdirs = [ "light", ] diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 7e3f249..5aba7ff 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 := cortex-a53 +TARGET_CPU_VARIANT := generic 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 := cortex-a53 +TARGET_2ND_CPU_VARIANT := generic TARGET_2ND_CPU_VARIANT_RUNTIME := cortex-a53 TARGET_USES_64_BIT_BINDER := true @@ -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/wlan/parameters/firmware_path" +WIFI_DRIVER_FW_PATH_PARAM := "/sys/module/bcmdhd/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/audio/audio_effects.xml b/audio/audio_effects.xml index ced294b..3b87058 100644 --- a/audio/audio_effects.xml +++ b/audio/audio_effects.xml @@ -3,51 +3,31 @@ - - + - - - + + + + - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - + + + + + - - + + + + + + diff --git a/audio/audio_policy_configuration.xml b/audio/audio_policy_configuration.xml index c89bc36..32908bb 100644 --- a/audio/audio_policy_configuration.xml +++ b/audio/audio_policy_configuration.xml @@ -63,6 +63,10 @@ + + + + sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,BT SCO Headset Mic"/> + sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,BT SCO Headset Mic,Telephony Rx"/> + sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,BT SCO Headset Mic,Telephony Rx"/> + sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,BT SCO Headset Mic,Telephony Rx"/> + sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload"/> + sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload"/> + sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx"/> + sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx"/> + sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx"/> 524288,2097152,4194304,262144,524288,1048576 - - false - com.google.android.gms/com.google.android.gms.nearby.messages.service.NearbyMessagesService diff --git a/radio.mk b/radio.mk index b8d7905..23d3aa0 100644 --- a/radio.mk +++ b/radio.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2017-2021 The LineageOS Project +# Copyright (C) 2017 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:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/android.hardware.telephony.gsm.xml + frameworks/native/data/etc/android.hardware.telephony.gsm.xml:system/etc/permissions/android.hardware.telephony.gsm.xml # Properties PRODUCT_PROPERTY_OVERRIDES += \ diff --git a/rootdir/fstab.qcom b/rootdir/fstab.qcom index 55bed1b..1567ff3 100644 --- a/rootdir/fstab.qcom +++ b/rootdir/fstab.qcom @@ -8,7 +8,6 @@ /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 diff --git a/rootdir/init.qcom.rc b/rootdir/init.qcom.rc index d47b6ae..6a03677 100644 --- a/rootdir/init.qcom.rc +++ b/rootdir/init.qcom.rc @@ -463,10 +463,13 @@ 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/wlan/parameters/firmware_path + chown wifi wifi /sys/module/bcmdhd/parameters/firmware_path 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 diff --git a/sepolicy/vendor/charger.te b/sepolicy/vendor/charger.te index fbeca80..f15938b 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 r_file_perms; +allow charger sysfs:file { open read getattr }; allow charger sysfs_usb_supply:file r_file_perms; diff --git a/sepolicy/vendor/file.te b/sepolicy/vendor/file.te index 2c8f772..1111362 100644 --- a/sepolicy/vendor/file.te +++ b/sepolicy/vendor/file.te @@ -1,6 +1,5 @@ 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 80aa7cd..b1b988e 100644 --- a/sepolicy/vendor/file_contexts +++ b/sepolicy/vendor/file_contexts @@ -20,9 +20,8 @@ /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\.[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 +/(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 # BRCM BT FM /sys/bus/platform/drivers/bcm_ldisc/bcmbt_ldisc(/.*)? u:object_r:brcm_ldisc_sysfs:s0 diff --git a/sepolicy/vendor/hal_drm_clearkey.te b/sepolicy/vendor/hal_drm_clearkey.te index bae05ce..286e248 100644 --- a/sepolicy/vendor/hal_drm_clearkey.te +++ b/sepolicy/vendor/hal_drm_clearkey.te @@ -8,4 +8,3 @@ 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 deleted file mode 100644 index 120a9ec..0000000 --- a/sepolicy/vendor/hal_drm_widevine.te +++ /dev/null @@ -1,2 +0,0 @@ -allow hal_drm_widevine mediadrm_vendor_data_file:dir create_dir_perms; -allow hal_drm_widevine mediadrm_vendor_data_file:file create_file_perms; diff --git a/sepolicy/vendor/hal_fingerprint_default.te b/sepolicy/vendor/hal_fingerprint_default.te index 26f89e2..355eec6 100644 --- a/sepolicy/vendor/hal_fingerprint_default.te +++ b/sepolicy/vendor/hal_fingerprint_default.te @@ -16,4 +16,5 @@ 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 088fdb7..c3df56f 100644 --- a/sepolicy/vendor/init-power-sh.te +++ b/sepolicy/vendor/init-power-sh.te @@ -1,4 +1,3 @@ -# 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 39a7c31..043036a 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 create_file_perms; +allow init diag_data_file:file { lock rename }; 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 4078ff8..9f6fe93 100644 --- a/sepolicy/vendor/loc_launcher.te +++ b/sepolicy/vendor/loc_launcher.te @@ -2,7 +2,6 @@ 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/mediadrmserver.te b/sepolicy/vendor/mediadrmserver.te deleted file mode 100644 index 5da38e7..0000000 --- a/sepolicy/vendor/mediadrmserver.te +++ /dev/null @@ -1 +0,0 @@ -allow mediadrmserver hal_drm_clearkey:binder { call transfer }; diff --git a/sepolicy/vendor/mlog_qmi_service.te b/sepolicy/vendor/mlog_qmi_service.te index d03d382..d097f59 100644 --- a/sepolicy/vendor/mlog_qmi_service.te +++ b/sepolicy/vendor/mlog_qmi_service.te @@ -7,6 +7,7 @@ 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 5c87aef..f845b64 100644 --- a/sepolicy/vendor/rild.te +++ b/sepolicy/vendor/rild.te @@ -15,5 +15,6 @@ 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 648f853..379d177 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 52a97d8..ab13d0f 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 sysfs:file r_file_perms; -allow timekeep sysfs_rtc:dir 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 timekeep_data_file:dir create_dir_perms; -allow timekeep timekeep_data_file:file create_file_perms; +allow timekeep sysfs:file r_file_perms; +allow timekeep sysfs_rtc:dir search; -- GitLab