diff --git a/patches/personal/platform_build/0001-removed-default-aosp-APNs.patch b/patches/personal/platform_build/0001-removed-default-aosp-APNs.patch deleted file mode 100644 index 959d69a7..00000000 --- a/patches/personal/platform_build/0001-removed-default-aosp-APNs.patch +++ /dev/null @@ -1,28 +0,0 @@ -From ba1ed604301f08fef66b34cad9c21d1916fe9a76 Mon Sep 17 00:00:00 2001 -From: kaii-lb -Date: Fri, 2 Aug 2024 08:54:17 +0000 -Subject: [PATCH] removed default aosp APNs - ---- - target/product/aosp_product.mk | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/target/product/aosp_product.mk b/target/product/aosp_product.mk -index 5196e6308b..becc3e5406 100644 ---- a/target/product/aosp_product.mk -+++ b/target/product/aosp_product.mk -@@ -29,12 +29,5 @@ PRODUCT_PACKAGES += \ - initial-package-stopped-states-aosp.xml \ - messaging \ - PhotoTable \ - preinstalled-packages-platform-aosp-product.xml \ - ThemePicker -- --# Telephony: --# Provide a APN configuration to GSI product --ifeq ($(EVEREST_BUILD),) --PRODUCT_COPY_FILES += \ -- device/sample/etc/apns-full-conf.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/apns-conf.xml --endif --- -2.45.2 diff --git a/patches/personal/platform_build/0002-un-enforce-gsi-makes-adb-insecure.patch b/patches/personal/platform_build/0002-un-enforce-gsi-makes-adb-insecure.patch deleted file mode 100644 index cdcdcb41..00000000 --- a/patches/personal/platform_build/0002-un-enforce-gsi-makes-adb-insecure.patch +++ /dev/null @@ -1,27 +0,0 @@ -From ff3d026357df560eec63b2dbaec39290141f7a93 Mon Sep 17 00:00:00 2001 -From: kaii-lb -Date: Fri, 2 Aug 2024 08:56:33 +0000 -Subject: [PATCH] un-enforce gsi makes adb insecure - ---- - target/board/gsi_system_ext.prop | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/target/board/gsi_system_ext.prop b/target/board/gsi_system_ext.prop -index 780aadc0ae..217bd012ad 100644 ---- a/target/board/gsi_system_ext.prop -+++ b/target/board/gsi_system_ext.prop -@@ -1,11 +1,8 @@ - # GSI always generate dex pre-opt in system image - ro.cp_system_other_odex=0 - --# GSI always disables adb authentication --ro.adb.secure=0 -- - # GSI disables non-AOSP nnapi extensions on product partition - ro.nnapi.extensions.deny_on_product=true - - # TODO(b/120679683): disable RescueParty before all problem apps solved - persist.sys.disable_rescue=true --- -2.45.2 diff --git a/patches/personal/platform_build/0003-remove-su-from-no-su-builds.patch b/patches/personal/platform_build/0003-remove-su-from-no-su-builds.patch deleted file mode 100644 index f1274f89..00000000 --- a/patches/personal/platform_build/0003-remove-su-from-no-su-builds.patch +++ /dev/null @@ -1,31 +0,0 @@ -From fae9111b9057448cecdf7b78e01dde9e6ba99487 Mon Sep 17 00:00:00 2001 -From: MisterZtr -Date: Wed, 7 Aug 2024 08:54:47 +0000 -Subject: [PATCH] remove su from no-su builds - ---- - target/product/base_system.mk | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/target/product/base_system.mk b/target/product/base_system.mk -index cc44dc5f46..8ab9721b27 100644 ---- a/target/product/base_system.mk -+++ b/target/product/base_system.mk -@@ -480,15 +480,10 @@ PRODUCT_PACKAGES_DEBUG := \ - traceroute6 \ - unwind_info \ - unwind_reg_info \ - unwind_symbols \ - --ifeq ($(EVEREST_BUILD),) --PRODUCT_PACKAGES_DEBUG += \ -- su --endif -- - # The set of packages whose code can be loaded by the system server. - PRODUCT_SYSTEM_SERVER_APPS += \ - SettingsProvider \ - - ifeq (,$(DISABLE_WALLPAPER_BACKUP)) --- -2.45.2 diff --git a/patches/personal/platform_build/0004-Prefer-Aperture-over-Camera2.patch b/patches/personal/platform_build/0004-Prefer-Aperture-over-Camera2.patch deleted file mode 100644 index 70750edf..00000000 --- a/patches/personal/platform_build/0004-Prefer-Aperture-over-Camera2.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 3723f6f327532ef68bdf2658fd7b0d6d05c9832d Mon Sep 17 00:00:00 2001 -From: Alberto Ponces -Date: Wed, 7 Aug 2024 08:58:45 +0000 -Subject: [PATCH] Prefer Aperture over Camera2 - ---- - target/product/handheld_product.mk | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/target/product/handheld_product.mk b/target/product/handheld_product.mk -index a584e0b60f..fb49dde946 100644 ---- a/target/product/handheld_product.mk -+++ b/target/product/handheld_product.mk -@@ -31,11 +31,11 @@ PRODUCT_PACKAGES += \ - SettingsIntelligence \ - frameworks-base-overlays - - ifeq ($(EVEREST_BUILD),) - PRODUCT_PACKAGES += \ -- Camera2 \ -+ Aperture \ - LatinIME - endif - - PRODUCT_PACKAGES_DEBUG += \ - frameworks-base-overlays-debug --- -2.45.2 diff --git a/patches/personal/platform_device_phh_treble/0001-added-shared-blocks-and-dup-rules-flags.patch b/patches/personal/platform_device_phh_treble/0001-added-shared-blocks-and-dup-rules-flags.patch deleted file mode 100644 index 4af83ddc..00000000 --- a/patches/personal/platform_device_phh_treble/0001-added-shared-blocks-and-dup-rules-flags.patch +++ /dev/null @@ -1,27 +0,0 @@ -From e3cc5d2d5a4d10d080c71a7e1b17ca2d06a05c94 Mon Sep 17 00:00:00 2001 -From: kaii-;b -Date: Mon, 22 Jul 2024 18:27:38 +0000 -Subject: [PATCH] added shared blocks and dup rules flags - ---- - board-base.mk | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/board-base.mk b/board-base.mk -index 2cb5dbc..774f7ee 100644 ---- a/board-base.mk -+++ b/board-base.mk -@@ -8,5 +8,11 @@ DEVICE_FRAMEWORK_MANIFEST_FILE := device/phh/treble/framework_manifest.xml - - BOARD_ROOT_EXTRA_FOLDERS += bt_firmware sec_storage efs persist - BUILD_BROKEN_ELF_PREBUILT_PRODUCT_COPY_FILES := true - - BOARD_ROOT_EXTRA_SYMLINKS := $(filter-out $(BOARD_ROOT_EXTRA_SYMLINKS),/mnt/vendor/persist:/persist) -+ -+# Build stuff -+BUILD_BROKEN_DUP_RULES := true -+ -+# Compression stuff -+BOARD_EXT4_SHARE_DUP_BLOCKS := true --- -2.45.2 diff --git a/patches/personal/platform_device_phh_treble/0002-make-corners-rounded-for-dialogs-and-buttons.patch b/patches/personal/platform_device_phh_treble/0002-make-corners-rounded-for-dialogs-and-buttons.patch deleted file mode 100644 index d453597a..00000000 --- a/patches/personal/platform_device_phh_treble/0002-make-corners-rounded-for-dialogs-and-buttons.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 093eae6ec0b00658235c82c02e165fa29fea5fe1 Mon Sep 17 00:00:00 2001 -From: kaii-lb -Date: Thu, 1 Aug 2024 13:40:14 +0000 -Subject: [PATCH] make corners rounded for dialogs and buttons - ---- - overlay/frameworks/base/core/res/res/values/config.xml | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml -index b832a66..4a6e497 100644 ---- a/overlay/frameworks/base/core/res/res/values/config.xml -+++ b/overlay/frameworks/base/core/res/res/values/config.xml -@@ -28,12 +28,12 @@ - true - - com.android.systemui/com.android.systemui.doze.DozeService - true - true -- 8.0dip -- 4.0dip -+ 32.0dip -+ 32.0dip - - true - - - --- -2.45.2 diff --git a/patches/personal/platform_device_phh_treble/0003-removed-ro.adb.secure-0.patch b/patches/personal/platform_device_phh_treble/0003-removed-ro.adb.secure-0.patch deleted file mode 100644 index 59da2aac..00000000 --- a/patches/personal/platform_device_phh_treble/0003-removed-ro.adb.secure-0.patch +++ /dev/null @@ -1,27 +0,0 @@ -From ea4545e7bd2ad65906810db2a01fb0eed228ef78 Mon Sep 17 00:00:00 2001 -From: kaii-lb -Date: Fri, 2 Aug 2024 09:54:44 +0000 -Subject: [PATCH] removed ro.adb.secure=0 - ---- - base.mk | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/base.mk b/base.mk -index 43e261b..beec8b4 100644 ---- a/base.mk -+++ b/base.mk -@@ -31,11 +31,10 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ - ro.build.version.sdk=$(PLATFORM_SDK_VERSION) \ - ro.build.version.codename=$(PLATFORM_VERSION_CODENAME) \ - ro.build.version.all_codenames=$(PLATFORM_VERSION_ALL_CODENAMES) \ - ro.build.version.release=$(PLATFORM_VERSION) \ - ro.build.version.security_patch=$(PLATFORM_SECURITY_PATCH) \ -- ro.adb.secure=0 \ - ro.logd.auditd=true \ - ro.logd.kernel=true \ - - #Huawei HiSuite (also other OEM custom programs I guess) it's of no use in AOSP builds - PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ --- -2.45.2 diff --git a/patches/personal/platform_device_phh_treble/0004-Add-workaround-for-oplus-alert-slider-than.patch b/patches/personal/platform_device_phh_treble/0004-Add-workaround-for-oplus-alert-slider-than.patch deleted file mode 100644 index 5c641f19..00000000 --- a/patches/personal/platform_device_phh_treble/0004-Add-workaround-for-oplus-alert-slider-than.patch +++ /dev/null @@ -1,30 +0,0 @@ -From abecf851dc0201eab2554602cd3152ae600d0353 Mon Sep 17 00:00:00 2001 -From: "Christopher A. Williamson" -Date: Wed, 17 Jan 2024 11:03:45 +0000 -Subject: [PATCH 3/11] Add workaround for oplus alert slider (thanks to PHH) - ---- - cmds/oplus-alert-slider.cpp | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/cmds/oplus-alert-slider.cpp b/cmds/oplus-alert-slider.cpp -index d2a73a8..c22c37f 100644 ---- a/cmds/oplus-alert-slider.cpp -+++ b/cmds/oplus-alert-slider.cpp -@@ -44,11 +44,11 @@ int main() { - } - printf("State %d\n", read_tristate()); - if(state == 1) { -- system("service call audio 41 i32 0 s16 android"); -+ system("service call audio 42 i32 0 s16 android"); - } else if(state == 2) { -- system("service call audio 41 i32 1 s16 android"); -+ system("service call audio 42 i32 1 s16 android"); - } else if(state == 3) { -- system("service call audio 41 i32 2 s16 android"); -+ system("service call audio 42 i32 2 s16 android"); - } - } - } --- -2.42.0 diff --git a/patches/personal/platform_device_phh_treble/0005-Fix-treble-app-allow-in-powersave.patch b/patches/personal/platform_device_phh_treble/0005-Fix-treble-app-allow-in-powersave.patch deleted file mode 100644 index 0e9c6ddb..00000000 --- a/patches/personal/platform_device_phh_treble/0005-Fix-treble-app-allow-in-powersave.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 74fcbe90c22103b4592632b963d30263932eccf9 Mon Sep 17 00:00:00 2001 -From: ChonDoit -Date: Fri, 7 Jul 2023 01:29:15 +0000 -Subject: [PATCH 9/11] Move TrebleApp allow-in-power-save to sysconfig - -Isn't parsed as permissions anymore, now belongs to ---- - base.mk | 3 ++- - privapp-permissions-me.phh.treble.app.xml | 3 --- - sysconfig-me.phh.treble.app.xml | 8 ++++++++ - 3 files changed, 10 insertions(+), 4 deletions(-) - create mode 100644 sysconfig-me.phh.treble.app.xml - -diff --git a/base.mk b/base.mk -index 620fb96..c32f3d8 100644 ---- a/base.mk -+++ b/base.mk -@@ -195,7 +195,8 @@ PRODUCT_PACKAGES += \ - - # Privapp-permissions whitelist for PhhTrebleApp - PRODUCT_COPY_FILES += \ -- device/phh/treble/privapp-permissions-me.phh.treble.app.xml:system/etc/permissions/privapp-permissions-me.phh.treble.app.xml -+ device/phh/treble/privapp-permissions-me.phh.treble.app.xml:system/etc/permissions/privapp-permissions-me.phh.treble.app.xml \ -+ device/phh/treble/sysconfig-me.phh.treble.app.xml:system/etc/sysconfig/sysconfig-me.phh.treble.app.xml - - # Remote debugging - PRODUCT_COPY_FILES += \ -diff --git a/privapp-permissions-me.phh.treble.app.xml b/privapp-permissions-me.phh.treble.app.xml -index 2f51f94..44acb9f 100644 ---- a/privapp-permissions-me.phh.treble.app.xml -+++ b/privapp-permissions-me.phh.treble.app.xml -@@ -7,7 +7,4 @@ - - - -- -- -- - -diff --git a/sysconfig-me.phh.treble.app.xml b/sysconfig-me.phh.treble.app.xml -new file mode 100644 -index 0000000..ea10cc1 ---- /dev/null -+++ b/sysconfig-me.phh.treble.app.xml -@@ -0,0 +1,8 @@ -+ -+ -+ -+ -+ -+ -+ -+ --- -2.34.1 diff --git a/patches/personal/platform_device_phh_treble/0007-Move-NoCutoutOverlay-to-product-selinux-context-fix.patch b/patches/personal/platform_device_phh_treble/0007-Move-NoCutoutOverlay-to-product-selinux-context-fix.patch deleted file mode 100644 index cb7c7523..00000000 --- a/patches/personal/platform_device_phh_treble/0007-Move-NoCutoutOverlay-to-product-selinux-context-fix.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 05d4507b42b48be14158a4a1e9e865a0a117c73f Mon Sep 17 00:00:00 2001 -From: "Christopher A. Williamson" -Date: Mon, 22 Jan 2024 18:04:03 +0000 -Subject: [PATCH 7/11] Move NoCutoutOverlay to /product - selinux context fix - ---- - overlay/packages/apps/overlays/NoCutoutOverlay/Android.mk | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/overlay/packages/apps/overlays/NoCutoutOverlay/Android.mk b/overlay/packages/apps/overlays/NoCutoutOverlay/Android.mk -index 839a9ec..afe97f1 100644 ---- a/overlay/packages/apps/overlays/NoCutoutOverlay/Android.mk -+++ b/overlay/packages/apps/overlays/NoCutoutOverlay/Android.mk -@@ -8,6 +8,8 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files) - - LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res - -+LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay -+ - LOCAL_PACKAGE_NAME := NoCutoutOverlay - LOCAL_SDK_VERSION := current - --- -2.42.0 diff --git a/patches/personal/platform_device_phh_treble/0008-removed-ro-adb-secure.patch b/patches/personal/platform_device_phh_treble/0008-removed-ro-adb-secure.patch deleted file mode 100755 index 94bc384f..00000000 --- a/patches/personal/platform_device_phh_treble/0008-removed-ro-adb-secure.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 6e79e2f9dd9c62b7848f639f4468b8927efb7112 Mon Sep 17 00:00:00 2001 -From: kaii-lb -Date: Fri, 2 Aug 2024 10:09:39 +0000 -Subject: [PATCH] removed ro.adb.secure=0 in system.prop - ---- - system.prop | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/system.prop b/system.prop -index f3c0c45..b2bcf63 100644 ---- a/system.prop -+++ b/system.prop -@@ -1,6 +1,5 @@ --ro.adb.secure=0 - #Some devices have sdcardfs kernel panicing on 8.0 - #Disable for everyone for the moment - ro.sys.sdcardfs=0 - persist.sys.overlay.nightmode=true - --- -2.45.2 diff --git a/patches/personal/platform_device_phh_treble/0009-Allow-servicemanager-to-access-hal-audio-sysbta.patch b/patches/personal/platform_device_phh_treble/0009-Allow-servicemanager-to-access-hal-audio-sysbta.patch deleted file mode 100644 index 7ef4263d..00000000 --- a/patches/personal/platform_device_phh_treble/0009-Allow-servicemanager-to-access-hal-audio-sysbta.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 4a7c81ca9da035f9aa03c41fa087fbdc5d2d87af Mon Sep 17 00:00:00 2001 -From: ChonDoit -Date: Fri, 11 Nov 2022 21:09:06 +0000 -Subject: [PATCH 3/5] Allow servicemanager to access hal_audio_sysbta - ---- - sepolicy/hal_audio_sysbta.te | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/sepolicy/hal_audio_sysbta.te b/sepolicy/hal_audio_sysbta.te -index d871ed3..e5c6087 100644 ---- a/sepolicy/hal_audio_sysbta.te -+++ b/sepolicy/hal_audio_sysbta.te -@@ -8,3 +8,7 @@ hal_client_domain(hal_audio_sysbta, hal_allocator) - - # allow audioserver to call hal_audio dump with its own fd to retrieve status - allow hal_audio_sysbta audioserver:fifo_file write; -+ -+# Allow servicemanager to access hal_audio_sysbta -+allow servicemanager hal_audio_sysbta:dir r_dir_perms; -+allow servicemanager hal_audio_sysbta:file r_file_perms; --- -2.34.1 diff --git a/patches/personal/platform_device_phh_treble/0010-more-mediatek-radio-fuckery.patch b/patches/personal/platform_device_phh_treble/0010-more-mediatek-radio-fuckery.patch deleted file mode 100644 index 53ed6292..00000000 --- a/patches/personal/platform_device_phh_treble/0010-more-mediatek-radio-fuckery.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 1ad01fdaf28e39ed4c0e1b1a38121bd01b130c28 Mon Sep 17 00:00:00 2001 -From: kaii-lb -Date: Thu, 8 Aug 2024 12:03:22 +0000 -Subject: [PATCH] more mediatek radio fuckery - ---- - sepolicy/service_contexts | 59 +++++++++++++++++++++++++++++++++++++++ - 1 file changed, 59 insertions(+) - -diff --git a/sepolicy/service_contexts b/sepolicy/service_contexts -index a390e3f..3f39fb3 100644 ---- a/sepolicy/service_contexts -+++ b/sepolicy/service_contexts -@@ -14,3 +14,62 @@ android.hardware.bluetooth.audio.IBluetoothAudioProviderFactory/sysbta u:obje - - # QcRilAm - me.phh.qcrilam u:object_r:qcrilam_service:s0 -+ -+endor.mediatek.hardware.mtkradioex.data.IMtkRadioExData/slot1 u:object_r:hal_radio_service:s0 -+vendor.mediatek.hardware.mtkradioex.data.IMtkRadioExData/slot2 u:object_r:hal_radio_service:s0 -+vendor.mediatek.hardware.mtkradioex.data.IMtkRadioExData/slot3 u:object_r:hal_radio_service:s0 -+vendor.mediatek.hardware.mtkradioex.data.IMtkRadioExData/slot4 u:object_r:hal_radio_service:s0 -+vendor.mediatek.hardware.mtkradioex.ims.IMtkRadioExIms/slot1 u:object_r:hal_radio_service:s0 -+vendor.mediatek.hardware.mtkradioex.ims.IMtkRadioExIms/slot2 u:object_r:hal_radio_service:s0 -+vendor.mediatek.hardware.mtkradioex.ims.IMtkRadioExIms/slot3 u:object_r:hal_radio_service:s0 -+vendor.mediatek.hardware.mtkradioex.ims.IMtkRadioExIms/slot4 u:object_r:hal_radio_service:s0 -+vendor.mediatek.hardware.mtkradioex.messaging.IMtkRadioExMessaging/slot1 u:object_r:hal_radio_service:s0 -+vendor.mediatek.hardware.mtkradioex.messaging.IMtkRadioExMessaging/slot2 u:object_r:hal_radio_service:s0 -+vendor.mediatek.hardware.mtkradioex.messaging.IMtkRadioExMessaging/slot3 u:object_r:hal_radio_service:s0 -+vendor.mediatek.hardware.mtkradioex.messaging.IMtkRadioExMessaging/slot4 u:object_r:hal_radio_service:s0 -+vendor.mediatek.hardware.mtkradioex.modem.IMtkRadioExModem/slot1 u:object_r:hal_radio_service:s0 -+vendor.mediatek.hardware.mtkradioex.modem.IMtkRadioExModem/slot2 u:object_r:hal_radio_service:s0 -+vendor.mediatek.hardware.mtkradioex.modem.IMtkRadioExModem/slot3 u:object_r:hal_radio_service:s0 -+vendor.mediatek.hardware.mtkradioex.modem.IMtkRadioExModem/slot4 u:object_r:hal_radio_service:s0 -+vendor.mediatek.hardware.mtkradioex.network.IMtkRadioExNetwork/slot1 u:object_r:hal_radio_service:s0 -+vendor.mediatek.hardware.mtkradioex.network.IMtkRadioExNetwork/slot2 u:object_r:hal_radio_service:s0 -+vendor.mediatek.hardware.mtkradioex.network.IMtkRadioExNetwork/slot3 u:object_r:hal_radio_service:s0 -+vendor.mediatek.hardware.mtkradioex.network.IMtkRadioExNetwork/slot4 u:object_r:hal_radio_service:s0 -+vendor.mediatek.hardware.mtkradioex.sim.IMtkRadioExSim/slot1 u:object_r:hal_radio_service:s0 -+vendor.mediatek.hardware.mtkradioex.sim.IMtkRadioExSim/slot2 u:object_r:hal_radio_service:s0 -+vendor.mediatek.hardware.mtkradioex.sim.IMtkRadioExSim/slot3 u:object_r:hal_radio_service:s0 -+vendor.mediatek.hardware.mtkradioex.sim.IMtkRadioExSim/slot4 u:object_r:hal_radio_service:s0 -+vendor.mediatek.hardware.mtkradioex.voice.IMtkRadioExVoice/slot1 u:object_r:hal_radio_service:s0 -+vendor.mediatek.hardware.mtkradioex.voice.IMtkRadioExVoice/slot2 u:object_r:hal_radio_service:s0 -+vendor.mediatek.hardware.mtkradioex.voice.IMtkRadioExVoice/slot3 u:object_r:hal_radio_service:s0 -+vendor.mediatek.hardware.mtkradioex.voice.IMtkRadioExVoice/slot4 u:object_r:hal_radio_service:s0 -+vendor.mediatek.hardware.mtkradioex.rcs.IMtkRadioExRcs/slot1 u:object_r:hal_radio_service:s0 -+vendor.mediatek.hardware.mtkradioex.rcs.IMtkRadioExRcs/slot2 u:object_r:hal_radio_service:s0 -+vendor.mediatek.hardware.mtkradioex.rcs.IMtkRadioExRcs/slot3 u:object_r:hal_radio_service:s0 -+vendor.mediatek.hardware.mtkradioex.rcs.IMtkRadioExRcs/slot4 u:object_r:hal_radio_service:s0 -+ -+android.hardware.radio.modem.IRadioModem/imsSlot1 u:object_r:hal_radio_service:s0 -+android.hardware.radio.modem.IRadioModem/imsSlot2 u:object_r:hal_radio_service:s0 -+android.hardware.radio.modem.IRadioModem/imsSlot3 u:object_r:hal_radio_service:s0 -+android.hardware.radio.modem.IRadioModem/imsSlot4 u:object_r:hal_radio_service:s0 -+android.hardware.radio.network.IRadioNetwork/imsSlot1 u:object_r:hal_radio_service:s0 -+android.hardware.radio.network.IRadioNetwork/imsSlot2 u:object_r:hal_radio_service:s0 -+android.hardware.radio.network.IRadioNetwork/imsSlot3 u:object_r:hal_radio_service:s0 -+android.hardware.radio.network.IRadioNetwork/imsSlot4 u:object_r:hal_radio_service:s0 -+android.hardware.radio.sim.IRadioSim/imsSlot1 u:object_r:hal_radio_service:s0 -+android.hardware.radio.sim.IRadioSim/imsSlot2 u:object_r:hal_radio_service:s0 -+android.hardware.radio.sim.IRadioSim/imsSlot3 u:object_r:hal_radio_service:s0 -+android.hardware.radio.sim.IRadioSim/imsSlot4 u:object_r:hal_radio_service:s0 -+android.hardware.radio.voice.IRadioVoice/imsSlot1 u:object_r:hal_radio_service:s0 -+android.hardware.radio.voice.IRadioVoice/imsSlot2 u:object_r:hal_radio_service:s0 -+android.hardware.radio.voice.IRadioVoice/imsSlot3 u:object_r:hal_radio_service:s0 -+android.hardware.radio.voice.IRadioVoice/imsSlot4 u:object_r:hal_radio_service:s0 -+ -+android.hardware.radio.modem.IRadioModem/se1 u:object_r:hal_radio_service:s0 -+android.hardware.radio.modem.IRadioModem/se2 u:object_r:hal_radio_service:s0 -+android.hardware.radio.modem.IRadioModem/se3 u:object_r:hal_radio_service:s0 -+android.hardware.radio.modem.IRadioModem/se4 u:object_r:hal_radio_service:s0 -+android.hardware.radio.sim.IRadioSim/se1 u:object_r:hal_radio_service:s0 -+android.hardware.radio.sim.IRadioSim/se2 u:object_r:hal_radio_service:s0 -+android.hardware.radio.sim.IRadioSim/se3 u:object_r:hal_radio_service:s0 -+android.hardware.radio.sim.IRadioSim/se4 u:object_r:hal_radio_service:s0 --- -2.45.2 diff --git a/patches/personal/platform_frameworks_base/0001-UGLY-hack-around-screenrecord-failure-not-sure-if-wo.patch b/patches/personal/platform_frameworks_base/0001-UGLY-hack-around-screenrecord-failure-not-sure-if-wo.patch deleted file mode 100644 index dfbc9a42..00000000 --- a/patches/personal/platform_frameworks_base/0001-UGLY-hack-around-screenrecord-failure-not-sure-if-wo.patch +++ /dev/null @@ -1,39 +0,0 @@ -From f2bc3f6faeeff18957254913e131cc8dcfcd89ac Mon Sep 17 00:00:00 2001 -From: kaii-lb -Date: Fri, 2 Aug 2024 15:32:22 +0000 -Subject: [PATCH] UGLY hack around screenrecord failure, not sure if works - -please don't do this, find an actual solution ---- - .../systemui/screenrecord/ScreenMediaRecorder.java | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenMediaRecorder.java b/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenMediaRecorder.java -index 61388923c5bd..219cea9743d7 100644 ---- a/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenMediaRecorder.java -+++ b/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenMediaRecorder.java -@@ -291,12 +291,20 @@ public class ScreenMediaRecorder extends MediaProjection.Callback { - } - - if (width >= screenWidthAligned && height >= screenHeightAligned - && vc.isSizeSupported(screenWidthAligned, screenHeightAligned)) { - // Desired size is supported, now get the rate -- int maxRate = vc.getSupportedFrameRatesFor(screenWidthAligned, -- screenHeightAligned).getUpper().intValue(); -+ // Hack around refresh rate failure, try not to uhh, do this -+ int maxRate = 30; -+ -+ try { -+ maxRate = vc.getSupportedFrameRatesFor(screenWidthAligned, -+ screenHeightAligned).getUpper().intValue(); -+ } catch (IllegalArgumentException e) { -+ Log.e(TAG, "UGLY: Hacking around getSupportFrameRatesFor failure...fix me"); -+ maxRate = 30; -+ } - - if (maxRate < refreshRate) { - refreshRate = maxRate; - } - Log.d(TAG, "Screen size supported at rate " + refreshRate); --- -2.45.2 diff --git a/patches/personal/platform_frameworks_base/0003-Disable-onInputDeviceChanged-to-solve-soft-bootloop.patch b/patches/personal/platform_frameworks_base/0003-Disable-onInputDeviceChanged-to-solve-soft-bootloop.patch deleted file mode 100644 index f8cfdc96..00000000 --- a/patches/personal/platform_frameworks_base/0003-Disable-onInputDeviceChanged-to-solve-soft-bootloop.patch +++ /dev/null @@ -1,60 +0,0 @@ -From bff98f2770714f469d9b5b70d588cba8bb48bac7 Mon Sep 17 00:00:00 2001 -From: kaii-lb -Date: Sat, 3 Aug 2024 23:21:19 +0000 -Subject: [PATCH] Disable onInputDeviceChanged to solve soft bootloop - ---- - .../input/KeyboardBacklightController.java | 34 ++++++++++--------- - 1 file changed, 18 insertions(+), 16 deletions(-) - -diff --git a/services/core/java/com/android/server/input/KeyboardBacklightController.java b/services/core/java/com/android/server/input/KeyboardBacklightController.java -index c3205afe14f2..aa561464e3b4 100644 ---- a/services/core/java/com/android/server/input/KeyboardBacklightController.java -+++ b/services/core/java/com/android/server/input/KeyboardBacklightController.java -@@ -374,26 +374,28 @@ final class KeyboardBacklightController implements - } - - @VisibleForTesting - @Override - public void onInputDeviceChanged(int deviceId) { -- InputDevice inputDevice = getInputDevice(deviceId); -- if (inputDevice == null) { -- return; -- } -- final Light keyboardBacklight = getKeyboardBacklight(inputDevice); -- if (keyboardBacklight == null) { -- mKeyboardBacklights.remove(deviceId); -- return; -- } -- KeyboardBacklightState state = mKeyboardBacklights.get(deviceId); -- if (state != null && state.mLight.getId() == keyboardBacklight.getId()) { -- return; -- } -- // The keyboard backlight was added or changed. -- mKeyboardBacklights.put(deviceId, new KeyboardBacklightState(deviceId, keyboardBacklight)); -- maybeRestoreBacklightBrightness(inputDevice, keyboardBacklight); -+ // apparently can causes a soft bootloop, so we disable it instead -+ -+ // InputDevice inputDevice = getInputDevice(deviceId); -+ // if (inputDevice == null) { -+ // return; -+ // } -+ // final Light keyboardBacklight = getKeyboardBacklight(inputDevice); -+ // if (keyboardBacklight == null) { -+ // mKeyboardBacklights.remove(deviceId); -+ // return; -+ // } -+ // KeyboardBacklightState state = mKeyboardBacklights.get(deviceId); -+ // if (state != null && state.mLight.getId() == keyboardBacklight.getId()) { -+ // return; -+ // } -+ // // The keyboard backlight was added or changed. -+ // mKeyboardBacklights.put(deviceId, new KeyboardBacklightState(deviceId, keyboardBacklight)); -+ // maybeRestoreBacklightBrightness(inputDevice, keyboardBacklight); - } - - private InputDevice getInputDevice(int deviceId) { - InputManager inputManager = mContext.getSystemService(InputManager.class); - return inputManager != null ? inputManager.getInputDevice(deviceId) : null; --- -2.45.2 diff --git a/patches/personal/platform_hardware_lineage_compat/001-Remove-conflict-with-vndk-v28.patch b/patches/personal/platform_hardware_lineage_compat/001-Remove-conflict-with-vndk-v28.patch deleted file mode 100644 index 17bc3a47..00000000 --- a/patches/personal/platform_hardware_lineage_compat/001-Remove-conflict-with-vndk-v28.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 0d9f77813aa99a187e703108c309bdd6eede7b78 Mon Sep 17 00:00:00 2001 -From: kaii-lb -Date: Fri, 12 Jul 2024 19:15:18 +0000 -Subject: [PATCH] remove conflicting protobuf library - ---- - Android.bp | 38 -------------------------------------- - 1 file changed, 38 deletions(-) - -diff --git a/Android.bp b/Android.bp -index 75375be..e8a409b 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -452,41 +452,3 @@ cc_library_shared { - compile_multilib: "64", - vendor: true, - } -- --cc_prebuilt_library_shared { -- name: "libprotobuf-cpp-full-vendorcompat", -- stem: "libprotobuf-cpp-full", -- vendor: true, -- strip: { -- none: true, -- }, -- target: { -- android_arm: { -- srcs: ["vndk/v29/arm/libprotobuf-cpp-full.so"], -- }, -- android_arm64: { -- srcs: ["vndk/v29/arm64/libprotobuf-cpp-full.so"], -- }, -- }, -- compile_multilib: "both", -- check_elf_files: false, --} -- --cc_prebuilt_library_shared { -- name: "libprotobuf-cpp-lite-vendorcompat", -- stem: "libprotobuf-cpp-lite", -- vendor: true, -- strip: { -- none: true, -- }, -- target: { -- android_arm: { -- srcs: ["vndk/v29/arm/libprotobuf-cpp-lite.so"], -- }, -- android_arm64: { -- srcs: ["vndk/v29/arm64/libprotobuf-cpp-lite.so"], -- }, -- }, -- compile_multilib: "both", -- check_elf_files: false, --} --- -2.45.1 diff --git a/patches/personal/platform_packages_apps_Aperture/0001-Enable-auxiliary-cameras.patch b/patches/personal/platform_packages_apps_Aperture/0001-Enable-auxiliary-cameras.patch deleted file mode 100644 index 092ecffa..00000000 --- a/patches/personal/platform_packages_apps_Aperture/0001-Enable-auxiliary-cameras.patch +++ /dev/null @@ -1,25 +0,0 @@ -From f75a9f85f373f70748de6146ff12a68ddd63c863 Mon Sep 17 00:00:00 2001 -From: ChonDoit -Date: Mon, 24 Apr 2023 16:55:33 +0000 -Subject: [PATCH 1/1] Enable Auxiliary Cameras - -Change-Id: I2bff41fcba4761666bbd0f4468a06ba89abfc033 ---- - app/src/main/res/values/config.xml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/app/src/main/res/values/config.xml b/app/src/main/res/values/config.xml -index 39d9698..f044d7f 100644 ---- a/app/src/main/res/values/config.xml -+++ b/app/src/main/res/values/config.xml -@@ -5,7 +5,7 @@ - --> - - -- false -+ true - - - --- -2.34.1 diff --git a/patches/personal/platform_packages_modules_vndk/0001-Add-vndk-v28-apex.patch b/patches/personal/platform_packages_modules_vndk/0001-Add-vndk-v28-apex.patch deleted file mode 100644 index 423e92a6..00000000 --- a/patches/personal/platform_packages_modules_vndk/0001-Add-vndk-v28-apex.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 69c5bfad568466f5325118cb372837712391cd0c Mon Sep 17 00:00:00 2001 -From: kaii-lb -Date: Fri, 12 Jul 2024 19:09:34 +0000 -Subject: [PATCH] add vndk v28 apex module - -Change-Id: I9e51677439faeac97ec3414f99f300300af407c6 ---- - apex/Android.bp | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/apex/Android.bp b/apex/Android.bp -index 3e20230..4ccf12f 100644 ---- a/apex/Android.bp -+++ b/apex/Android.bp -@@ -89,3 +89,9 @@ apex_vndk { - system_ext_specific: true, - } - -+apex_vndk { -+ name: "com.android.vndk.v28", -+ defaults: ["vndk-apex-defaults"], -+ vndk_version: "28", -+ system_ext_specific: true, -+} --- -2.45.1 diff --git a/patches/personal/platform_system_vold/0001-add-missing-texfat-log.patch b/patches/personal/platform_system_vold/0001-add-missing-texfat-log.patch deleted file mode 100644 index 5378ec42..00000000 --- a/patches/personal/platform_system_vold/0001-add-missing-texfat-log.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 720c9773aaed2f969d70df02f0bf5d5344fa5713 Mon Sep 17 00:00:00 2001 -From: Huy Hoang -Date: Fri, 2 Aug 2024 13:14:07 +0000 -Subject: [PATCH] add missing texfat log - ---- - main.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/main.cpp b/main.cpp -index 8a02279..2518800 100644 ---- a/main.cpp -+++ b/main.cpp -@@ -71,10 +71,11 @@ int main(int argc, char** argv) { - - ATRACE_BEGIN("main"); - - LOG(DEBUG) << "Detected support for:" - << (android::vold::IsFilesystemSupported("exfat") ? " exfat" : "") -+ << (android::vold::IsFilesystemSupported("texfat") ? " texfat" : "") - << (android::vold::IsFilesystemSupported("ext4") ? " ext4" : "") - << (android::vold::IsFilesystemSupported("f2fs") ? " f2fs" : "") - << (android::vold::IsFilesystemSupported("ntfs") ? " ntfs" : "") - << (android::vold::IsFilesystemSupported("vfat") ? " vfat" : ""); - --- -2.45.2 diff --git a/patches/personal/platform_treble_app/0001-moved-phhsettings-into-system-settings.patch b/patches/personal/platform_treble_app/0001-moved-phhsettings-into-system-settings.patch deleted file mode 100644 index 27175671..00000000 --- a/patches/personal/platform_treble_app/0001-moved-phhsettings-into-system-settings.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 49b995d0563ccc327bebf5b39a74a6639d36a29e Mon Sep 17 00:00:00 2001 -From: kaii-lb -Date: Sun, 28 Jul 2024 21:56:29 +0000 -Subject: [PATCH] moved phhsettings into system settings - ---- - app/src/main/AndroidManifest.xml | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml -index 25d3277..36b1571 100644 ---- a/app/src/main/AndroidManifest.xml -+++ b/app/src/main/AndroidManifest.xml -@@ -90,15 +90,15 @@ - - - - - -- -+ - - - -- -+ - - - -Date: Tue, 30 Jul 2024 09:30:58 +0000 -Subject: [PATCH] changed settings icon color to white - ---- - app/src/main/res/drawable/ic_settings.xml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml -index 3c56ed7..fb59e03 100644 ---- a/app/src/main/res/drawable/ic_settings.xml -+++ b/app/src/main/res/drawable/ic_settings.xml -@@ -3,7 +3,7 @@ - android:height="24dp" - android:viewportWidth="24.0" - android:viewportHeight="24.0" -- android:tint="?attr/colorControlNormal"> -+ android:tint="@android:color/white"> - --- -2.45.2 diff --git a/patches/personal/platform_treble_app/0003-remove-useless-securize-preference.patch b/patches/personal/platform_treble_app/0003-remove-useless-securize-preference.patch deleted file mode 100644 index 26a8b3e2..00000000 --- a/patches/personal/platform_treble_app/0003-remove-useless-securize-preference.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 92be572bc3b9f5fea86503d4c0ff90ca01017a04 Mon Sep 17 00:00:00 2001 -From: kaii-lb -Date: Thu, 1 Aug 2024 13:45:02 +0000 -Subject: [PATCH] remove useless securize preference - ---- - .../java/me/phh/treble/app/MiscSettings.kt | 33 ------------------- - app/src/main/res/xml/pref_misc.xml | 2 -- - 2 files changed, 35 deletions(-) - -diff --git a/app/src/main/java/me/phh/treble/app/MiscSettings.kt b/app/src/main/java/me/phh/treble/app/MiscSettings.kt -index 78556be..5c6259e 100644 ---- a/app/src/main/java/me/phh/treble/app/MiscSettings.kt -+++ b/app/src/main/java/me/phh/treble/app/MiscSettings.kt -@@ -56,43 +56,10 @@ object MiscSettings : Settings { - class MiscSettingsFragment : SettingsFragment() { - override val preferencesResId = R.xml.pref_misc - override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { - super.onCreatePreferences(savedInstanceState, rootKey) - -- val securizePref = findPreference(MiscSettings.securize) -- securizePref!!.setOnPreferenceClickListener { -- val builder = AlertDialog.Builder( this.getActivity() ) -- builder.setTitle(getString(R.string.remove_root)) -- builder.setMessage(getString(R.string.continue_question)) -- -- builder.setPositiveButton(android.R.string.yes) { dialog, which -> -- -- var cmds = listOf( -- arrayOf("/sbin/su", "-c", "/system/bin/phh-securize.sh"), -- arrayOf("/system/xbin/su", "-c", "/system/bin/phh-securize.sh"), -- arrayOf("/system/xbin/phh-su", "-c", "/system/bin/phh-securize.sh"), -- arrayOf("/sbin/su", "0", "/system/bin/phh-securize.sh"), -- arrayOf("/system/xbin/su", "0", "/system/bin/phh-securize.sh"), -- arrayOf("/system/xbin/phh-su", "0", "/system/bin/phh-securize.sh") -- ) -- for (cmd in cmds) { -- try { -- Runtime.getRuntime().exec(cmd).waitFor() -- break -- } catch (t: Throwable) { -- Log.d("PHH", "Failed to exec \"" + cmd.joinToString(separator = " ") + "\", skipping") -- } -- } -- } -- -- builder.setNegativeButton(android.R.string.no) { dialog, which -> -- } -- -- builder.show() -- return@setOnPreferenceClickListener true -- } -- - val removeTelephonyPref = findPreference(MiscSettings.removeTelephony) - removeTelephonyPref!!.setOnPreferenceClickListener { - - val builder = AlertDialog.Builder( this.getActivity() ) - builder.setTitle(getString(R.string.remove_telephony_subsystem)) -diff --git a/app/src/main/res/xml/pref_misc.xml b/app/src/main/res/xml/pref_misc.xml -index dbd8b88..d066265 100644 ---- a/app/src/main/res/xml/pref_misc.xml -+++ b/app/src/main/res/xml/pref_misc.xml -@@ -201,12 +201,10 @@ - android:defaultValue="00ff00" - android:entries="@array/pref_misc_fod_color" - android:entryValues="@array/pref_misc_fod_color_values" - android:key="key_misc_fod_color" - android:title="Under-display fp color" /> -- - - - - -Date: Mon, 22 Jul 2024 08:01:45 +0000 -Subject: [PATCH] hacked around ro.everest.device dupe with diff values - ---- - config/version.mk | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/config/version.mk b/config/version.mk -index 3815a277..a9f25d7f 100644 ---- a/config/version.mk -+++ b/config/version.mk -@@ -79,10 +79,14 @@ EVEREST_BUILD_VERSION := $(EVEREST_NUM_VER)-$(EVEREST_CODENAME) - EVEREST_VERSION := $(EVEREST_BUILD_VERSION)-$(EVEREST_BUILD)-$(EVEREST_BUILD_TYPE)-$(EVEREST_EDITION)-$(BUILD_TIME)-$(BUILD_DATE) - ROM_FINGERPRINT := everest/$(PLATFORM_VERSION)/$(TARGET_PRODUCT_SHORT)/$(BUILD_TIME) - EVEREST_DISPLAY_VERSION := $(EVEREST_VERSION) - RELEASE_TYPE := $(EVEREST_BUILD_TYPE) - -+# this is a hack please fix -+EVEREST_DEVICE_HOLDER := $(shell echo $(EVEREST_VERSION) | cut -f3 -d"-" | cut -f1 -d"_") -+EVEREST_DEVICE := $(shell echo tdgsi_$(EVEREST_DEVICE_HOLDER)_ab) -+ - # EverestOS System Version - PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ - ro.everest.base.codename=$(EVEREST_CODENAME) \ - ro.everest.base.version=$(EVEREST_NUM_VER) \ - ro.everest.build.version=$(EVEREST_BUILD_VERSION) \ -@@ -92,11 +96,11 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ - ro.everest.fingerprint=$(ROM_FINGERPRINT) \ - ro.everest.version=$(EVEREST_VERSION) \ - ro.modversion=$(EVEREST_VERSION) \ - ro.everestos.maintainer=$(EVEREST_MAINTAINER) \ - ro.everest.edition=$(EVEREST_EDITION) \ -- ro.everest.device=$(EVEREST_BUILD) -+ ro.everest.device=$(EVEREST_DEVICE) - - # Signing - ifneq (eng,$(TARGET_BUILD_VARIANT)) - ifneq (,$(wildcard vendor/everest/signing/keys/releasekey.pk8)) - PRODUCT_DEFAULT_DEV_CERTIFICATE := vendor/everest/signing/keys/releasekey --- -2.45.2 diff --git a/patches/personal/platform_vendor_everest/0002-Disable-generated-kernel-headers.patch b/patches/personal/platform_vendor_everest/0002-Disable-generated-kernel-headers.patch deleted file mode 100644 index 5af6b8bd..00000000 --- a/patches/personal/platform_vendor_everest/0002-Disable-generated-kernel-headers.patch +++ /dev/null @@ -1,46 +0,0 @@ -From a1e9e24e38ac68e261a9e95368ae8273a0cec370 Mon Sep 17 00:00:00 2001 -From: "Christopher A. Williamson" -Date: Fri, 2 Aug 2024 13:18:57 +0000 -Subject: [PATCH] Disable generated kernel headers - ---- - build/soong/Android.bp | 12 ------------ - 1 file changed, 12 deletions(-) - -diff --git a/build/soong/Android.bp b/build/soong/Android.bp -index 031c4b28..7b24836a 100644 ---- a/build/soong/Android.bp -+++ b/build/soong/Android.bp -@@ -18,30 +18,18 @@ bootstrap_go_package { - } - - everest_generator { - name: "generated_kernel_includes", - -- // The headers make command -- cmd: "$(PATH_OVERRIDE_SOONG) $(KERNEL_MAKE_CMD) $(KERNEL_MAKE_FLAGS) -C $(TARGET_KERNEL_SOURCE) O=$(KERNEL_BUILD_OUT_PREFIX)$(genDir) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) headers_install && vendor/everest/tools/clean_headers.sh $(KERNEL_BUILD_OUT_PREFIX)$(genDir)", -- - // Directories that can be imported by a cc_* module generated_headers property - export_include_dirs: [ - "usr/audio/include/uapi", - "usr/include", - "usr/include/audio", - "usr/include/audio/include/uapi", - "usr/techpack/audio/include", - ], -- -- // Sources for dependency tracking -- dep_root: "$(TARGET_KERNEL_SOURCE)", -- dep_files: [ -- "Makefile", -- "include/**/*", -- "arch/$(KERNEL_ARCH)/include/**/*", -- "techpack/audio/include/**/*", -- ], - } - - cc_defaults { - name: "generated_kernel_header_defaults", - generated_headers: ["generated_kernel_includes"], --- -2.45.2 diff --git a/patches/trebledroid/platform_bionic/0001-Disable-vndklite-handling.patch b/patches/trebledroid/platform_bionic/0001-Disable-vndklite-handling.patch index 65a98ab6..68dca6d4 100644 --- a/patches/trebledroid/platform_bionic/0001-Disable-vndklite-handling.patch +++ b/patches/trebledroid/platform_bionic/0001-Disable-vndklite-handling.patch @@ -1,19 +1,18 @@ -From 4366ac17628a57848d509473bc19c8f5dced7005 Mon Sep 17 00:00:00 2001 +From c0724aca39c9e50864d73d405c8bec8de757efbb Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson -Date: Tue, 16 Jul 2024 12:48:43 +0000 +Date: Wed, 27 Oct 2021 14:39:29 -0400 Subject: [PATCH 1/2] Disable vndklite handling +Change-Id: Ic4474cf80fc4b45a9a2760dd51e2ca29c4d961e2 --- linker/linker.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/linker/linker.cpp b/linker/linker.cpp -index a5913c26d..2ef56d2bc 100644 +index b0caeddc1..3e0e7fecf 100644 --- a/linker/linker.cpp +++ b/linker/linker.cpp -@@ -95,11 +95,10 @@ static uint64_t g_module_load_counter = 0; - static uint64_t g_module_unload_counter = 0; - +@@ -97,7 +97,6 @@ static uint64_t g_module_unload_counter = 0; static const char* const kLdConfigArchFilePath = "/system/etc/ld.config." ABI_STRING ".txt"; static const char* const kLdConfigFilePath = "/system/etc/ld.config.txt"; @@ -21,11 +20,7 @@ index a5913c26d..2ef56d2bc 100644 static const char* const kLdGeneratedConfigFilePath = "/linkerconfig/ld.config.txt"; - #if defined(__LP64__) - static const char* const kSystemLibDir = "/system/lib64"; -@@ -3538,14 +3537,10 @@ static std::string get_ld_config_file_apex_path(const char* executable_path) { - } - return ""; +@@ -3463,10 +3462,6 @@ static std::string get_ld_config_file_apex_path(const char* executable_path) { } static std::string get_ld_config_file_vndk_path() { @@ -36,7 +31,6 @@ index a5913c26d..2ef56d2bc 100644 std::string ld_config_file_vndk = kLdConfigFilePath; size_t insert_pos = ld_config_file_vndk.find_last_of('.'); if (insert_pos == std::string::npos) { - insert_pos = ld_config_file_vndk.length(); - } -- -2.45.1 +2.34.1 + diff --git a/patches/trebledroid/platform_bionic/0002-Add-new-mechanism-to-fake-vendor-props-on-a-per-proc.patch b/patches/trebledroid/platform_bionic/0002-Add-new-mechanism-to-fake-vendor-props-on-a-per-proc.patch index 7efbe2fc..dcd49a22 100644 --- a/patches/trebledroid/platform_bionic/0002-Add-new-mechanism-to-fake-vendor-props-on-a-per-proc.patch +++ b/patches/trebledroid/platform_bionic/0002-Add-new-mechanism-to-fake-vendor-props-on-a-per-proc.patch @@ -7,28 +7,23 @@ Subject: [PATCH 2/2] Add new mechanism to fake vendor props on a per-process This reads debug.phh.props.. If its value is "vendor", then ro.product.device/ro.product.manufacturer is read from vendor --- - libc/system_properties/system_properties.cpp | 86 +++++++++++++++++++- - 1 file changed, 84 insertions(+), 2 deletions(-) + libc/system_properties/system_properties.cpp | 87 +++++++++++++++++++- + 1 file changed, 85 insertions(+), 2 deletions(-) diff --git a/libc/system_properties/system_properties.cpp b/libc/system_properties/system_properties.cpp -index e82367ba1..bf1a11262 100644 +index 9dd5e35ce..886bef127 100644 --- a/libc/system_properties/system_properties.cpp +++ b/libc/system_properties/system_properties.cpp -@@ -34,10 +34,11 @@ - #include - #include +@@ -36,6 +36,8 @@ #include #include #include ++#include +#include #include - #include - #include -@@ -52,10 +53,89 @@ - - #define SERIAL_DIRTY(serial) ((serial)&1) +@@ -53,6 +55,85 @@ #define SERIAL_VALUE_LEN(serial) ((serial) >> 24) #define APPCOMPAT_PREFIX "ro.appcompat_override." @@ -114,11 +109,7 @@ index e82367ba1..bf1a11262 100644 static bool is_dir(const char* pathname) { struct stat info; if (stat(pathname, &info) == -1) { - return false; - } -@@ -157,23 +237,25 @@ uint32_t SystemProperties::AreaSerial() { - // Make sure this read fulfilled before __system_property_serial - return atomic_load_explicit(pa->serial(), memory_order_acquire); +@@ -156,17 +237,19 @@ uint32_t SystemProperties::AreaSerial() { } const prop_info* SystemProperties::Find(const char* name) { @@ -128,8 +119,6 @@ index e82367ba1..bf1a11262 100644 return nullptr; } - pi_hooks.OnFind(&name); - - prop_area* pa = contexts_->GetPropAreaForName(name); + prop_area* pa = contexts_->GetPropAreaForName(newName); if (!pa) { @@ -142,7 +131,6 @@ index e82367ba1..bf1a11262 100644 } static bool is_appcompat_override(const char* name) { - return strncmp(name, APPCOMPAT_PREFIX, strlen(APPCOMPAT_PREFIX)) == 0; - } -- -2.45.1 +2.34.1 + diff --git a/patches/trebledroid/platform_external_selinux/0003-Workaround-device-phh-treble-conflict-with-SELinux-p.patch b/patches/trebledroid/platform_external_selinux/0003-Workaround-device-phh-treble-conflict-with-SELinux-p.patch index 90b4be26..0ac28ce9 100644 --- a/patches/trebledroid/platform_external_selinux/0003-Workaround-device-phh-treble-conflict-with-SELinux-p.patch +++ b/patches/trebledroid/platform_external_selinux/0003-Workaround-device-phh-treble-conflict-with-SELinux-p.patch @@ -1,4 +1,4 @@ -From c4e188c849f31211acc099c4dfd2268ad91cf7af Mon Sep 17 00:00:00 2001 +From 2f8b7f6bbbcd30282ef9b8100133f26670557da5 Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Wed, 31 Mar 2021 23:32:37 +0200 Subject: [PATCH 03/10] Workaround device/phh/treble conflict with SELinux @@ -18,7 +18,7 @@ simply ignore them. 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/libsepol/cil/src/cil_binary.c b/libsepol/cil/src/cil_binary.c -index 40615db2..7d186515 100644 +index 40615db2..74a52956 100644 --- a/libsepol/cil/src/cil_binary.c +++ b/libsepol/cil/src/cil_binary.c @@ -511,13 +511,17 @@ int cil_typealias_to_policydb(policydb_t *pdb, struct cil_alias *cil_alias) @@ -36,7 +36,7 @@ index 40615db2..7d186515 100644 key = cil_strdup(cil_alias->datum.fqn); rc = symtab_insert(pdb, SYM_TYPES, key, sepol_alias, SCOPE_DECL, 0, NULL); if (rc != SEPOL_OK) { -+ cil_log(CIL_ERR, "Failed at %s:%s:%d:%d\n", __FILE__, __FUNCTION__, __LINE__, rc); ++ cil_log(CIL_ERR, "Failed at %s:%s:%d:%d\n", __FILE__, __FUNCTION__, __LINE__, rc); goto exit; } sepol_alias->s.value = sepol_type->s.value; @@ -113,3 +113,4 @@ index 91fa1075..d20fb7ee 100644 -- 2.34.1 + diff --git a/patches/trebledroid/platform_external_selinux/0004-Allow-devices-virtual-block-genfscon-conflict-seen-o.patch b/patches/trebledroid/platform_external_selinux/0004-Allow-devices-virtual-block-genfscon-conflict-seen-o.patch index e1fdebbb..e41c3b87 100644 --- a/patches/trebledroid/platform_external_selinux/0004-Allow-devices-virtual-block-genfscon-conflict-seen-o.patch +++ b/patches/trebledroid/platform_external_selinux/0004-Allow-devices-virtual-block-genfscon-conflict-seen-o.patch @@ -13,9 +13,7 @@ diff --git a/libsepol/cil/src/cil_post.c b/libsepol/cil/src/cil_post.c index a7c66ead..99410da0 100644 --- a/libsepol/cil/src/cil_post.c +++ b/libsepol/cil/src/cil_post.c -@@ -489,11 +489,27 @@ static int cil_post_portcon_context_compare(const void *a, const void *b) - - static int cil_post_genfscon_context_compare(const void *a, const void *b) +@@ -491,7 +491,23 @@ static int cil_post_genfscon_context_compare(const void *a, const void *b) { struct cil_genfscon *a_genfscon = *(struct cil_genfscon**)a; struct cil_genfscon *b_genfscon = *(struct cil_genfscon**)b; @@ -25,10 +23,10 @@ index a7c66ead..99410da0 100644 + fprintf(stderr, "hello %s\n", a_genfscon->fs_str); + int bypass = 0; + /* -+ * This conflict has been seen on Xiaomi Mi 9: -+ * - AOSP Q says (genfscon sysfs /devices/virtual/block/ (u object_r sysfs_devices_block ((s0) (s0)))) -+ * - stock rom says (genfscon sysfs /devices/virtual/block/ (u object_r sysfs_ufs_target ((s0) (s0)))) -+ */ ++ * This conflict has been seen on Xiaomi Mi 9: ++ * - AOSP Q says (genfscon sysfs /devices/virtual/block/ (u object_r sysfs_devices_block ((s0) (s0)))) ++ * - stock rom says (genfscon sysfs /devices/virtual/block/ (u object_r sysfs_ufs_target ((s0) (s0)))) ++ */ + if(strcmp(a_genfscon->path_str, "/devices/virtual/block/") == 0) + bypass = 1; + if(bypass == 1) { @@ -40,7 +38,6 @@ index a7c66ead..99410da0 100644 } static int cil_post_netifcon_context_compare(const void *a, const void *b) - { - int rc; -- -2.45.1 +2.34.1 + diff --git a/patches/trebledroid/platform_external_selinux/0006-Allow-mismatches-of-exfat-genfscon.patch b/patches/trebledroid/platform_external_selinux/0006-Allow-mismatches-of-exfat-genfscon.patch index 1889fcc6..77862018 100644 --- a/patches/trebledroid/platform_external_selinux/0006-Allow-mismatches-of-exfat-genfscon.patch +++ b/patches/trebledroid/platform_external_selinux/0006-Allow-mismatches-of-exfat-genfscon.patch @@ -8,24 +8,20 @@ Subject: [PATCH 06/10] Allow mismatches of exfat genfscon 1 file changed, 4 insertions(+) diff --git a/libsepol/cil/src/cil_post.c b/libsepol/cil/src/cil_post.c -index 99410da0..7a51d175 100644 +index 99410da0..7f614c03 100644 --- a/libsepol/cil/src/cil_post.c +++ b/libsepol/cil/src/cil_post.c -@@ -500,10 +500,14 @@ static int cil_post_genfscon_context_compare(const void *a, const void *b) - * - AOSP Q says (genfscon sysfs /devices/virtual/block/ (u object_r sysfs_devices_block ((s0) (s0)))) - * - stock rom says (genfscon sysfs /devices/virtual/block/ (u object_r sysfs_ufs_target ((s0) (s0)))) - */ +@@ -502,6 +502,10 @@ static int cil_post_genfscon_context_compare(const void *a, const void *b) + */ if(strcmp(a_genfscon->path_str, "/devices/virtual/block/") == 0) bypass = 1; + if(strcmp(a_genfscon->fs_str, "exfat") == 0 || strcmp(a_genfscon->fs_str, "esdfs") == 0) { + if(strcmp(a_genfscon->path_str, "/") == 0) + bypass = 1; -+ } ++ } if(bypass == 1) { fprintf(stderr, "Received conflicting %s vs %s but ignore\n", a_genfscon->path_str, b_genfscon->path_str); return 0; - } - } -- -2.45.1 +2.34.1 diff --git a/patches/trebledroid/platform_external_selinux/0009-Allow-sys-vm-watermark_scale_factor-conflict-seen-on.patch b/patches/trebledroid/platform_external_selinux/0009-Allow-sys-vm-watermark_scale_factor-conflict-seen-on.patch index e64081cf..47b0de4f 100644 --- a/patches/trebledroid/platform_external_selinux/0009-Allow-sys-vm-watermark_scale_factor-conflict-seen-on.patch +++ b/patches/trebledroid/platform_external_selinux/0009-Allow-sys-vm-watermark_scale_factor-conflict-seen-on.patch @@ -9,13 +9,11 @@ Subject: [PATCH 09/10] Allow /sys/vm/watermark_scale_factor conflict -- seen 1 file changed, 9 insertions(+) diff --git a/libsepol/cil/src/cil_post.c b/libsepol/cil/src/cil_post.c -index 34ce3856..36d41d71 100644 +index 7f614c03..1703b3b6 100644 --- a/libsepol/cil/src/cil_post.c +++ b/libsepol/cil/src/cil_post.c -@@ -486,10 +486,19 @@ int cil_post_genfscon_context_compare(const void *a, const void *b) - * - AOSP Q says (genfscon sysfs /devices/virtual/block/ (u object_r sysfs_devices_block ((s0) (s0)))) - * - stock rom says (genfscon sysfs /devices/virtual/block/ (u object_r sysfs_ufs_target ((s0) (s0)))) - */ +@@ -502,6 +502,15 @@ static int cil_post_genfscon_context_compare(const void *a, const void *b) + */ if(strcmp(a_genfscon->path_str, "/devices/virtual/block/") == 0) bypass = 1; + /* @@ -26,13 +24,10 @@ index 34ce3856..36d41d71 100644 + * Stock ROM uses it only in recovery so it's safe to ignore + */ + if(strcmp(a_genfscon->path_str, "/sys/vm/watermark_scale_factor") == 0) -+ bypass = 1; ++ bypass = 1; if(strcmp(a_genfscon->fs_str, "exfat") == 0 || strcmp(a_genfscon->fs_str, "esdfs") == 0) { if(strcmp(a_genfscon->path_str, "/") == 0) bypass = 1; - } - if(bypass == 1) { -- -2.45.1 - +2.34.1 diff --git a/patches/trebledroid/platform_external_selinux/0010-Allow-conflict-on-fuseblk.patch b/patches/trebledroid/platform_external_selinux/0010-Allow-conflict-on-fuseblk.patch index ebfc7660..55d6d620 100644 --- a/patches/trebledroid/platform_external_selinux/0010-Allow-conflict-on-fuseblk.patch +++ b/patches/trebledroid/platform_external_selinux/0010-Allow-conflict-on-fuseblk.patch @@ -8,22 +8,18 @@ Subject: [PATCH 10/10] Allow conflict on fuseblk 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libsepol/cil/src/cil_post.c b/libsepol/cil/src/cil_post.c -index 2a501ed8..0bdaaf38 100644 +index 1703b3b6..5428005d 100644 --- a/libsepol/cil/src/cil_post.c +++ b/libsepol/cil/src/cil_post.c -@@ -509,11 +509,11 @@ static int cil_post_genfscon_context_compare(const void *a, const void *b) - * - * Stock ROM uses it only in recovery so it's safe to ignore +@@ -511,7 +511,7 @@ static int cil_post_genfscon_context_compare(const void *a, const void *b) */ if(strcmp(a_genfscon->path_str, "/sys/vm/watermark_scale_factor") == 0) - bypass = 1; + bypass = 1; - if(strcmp(a_genfscon->fs_str, "exfat") == 0 || strcmp(a_genfscon->fs_str, "esdfs") == 0) { + if(strcmp(a_genfscon->fs_str, "exfat") == 0 || strcmp(a_genfscon->fs_str, "esdfs") == 0 || strcmp(a_genfscon->fs_str, "fuseblk") == 0) { if(strcmp(a_genfscon->path_str, "/") == 0) bypass = 1; - } - if(bypass == 1) { - fprintf(stderr, "Received conflicting %s vs %s but ignore\n", a_genfscon->path_str, b_genfscon->path_str); + } -- -2.45.1 +2.34.1 diff --git a/patches/trebledroid/platform_frameworks_av/0013-Make-camera-IDs-filter-out-optional.patch b/patches/trebledroid/platform_frameworks_av/0013-Make-camera-IDs-filter-out-optional.patch index 19203f20..186661b4 100644 --- a/patches/trebledroid/platform_frameworks_av/0013-Make-camera-IDs-filter-out-optional.patch +++ b/patches/trebledroid/platform_frameworks_av/0013-Make-camera-IDs-filter-out-optional.patch @@ -7,14 +7,14 @@ Nowadays most people have Camera 2 apps, and would like to have all cameras, rather than limit which cameras are available. Add a property for that. --- - .../common/CameraProviderManager.cpp | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) + .../common/CameraProviderManager.cpp | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/services/camera/libcameraservice/common/CameraProviderManager.cpp b/services/camera/libcameraservice/common/CameraProviderManager.cpp -index 24d6d5de95..6709dccaeb 100644 +index 60e4eb7b42..fbfdecc2ed 100644 --- a/services/camera/libcameraservice/common/CameraProviderManager.cpp +++ b/services/camera/libcameraservice/common/CameraProviderManager.cpp -@@ -318,7 +318,9 @@ std::vector CameraProviderManager::getAPI1CompatibleCameraDeviceIds +@@ -328,7 +328,9 @@ std::vector CameraProviderManager::getAPI1CompatibleCameraDeviceIds // API1 app doesn't handle logical and physical camera devices well. So // for each camera facing, only take the first id advertised by HAL in // all [logical, physical1, physical2, ...] id combos, and filter out the rest. @@ -25,21 +25,23 @@ index 24d6d5de95..6709dccaeb 100644 collectDeviceIdsLocked(providerDeviceIds, publicDeviceIds, systemDeviceIds); } auto sortFunc = -@@ -1112,6 +1114,15 @@ SystemCameraKind CameraProviderManager::ProviderInfo::DeviceInfo3::getSystemCame - entryCap.data.u8[0] == ANDROID_REQUEST_AVAILABLE_CAPABILITIES_SECURE_IMAGE_DATA) { - return SystemCameraKind::HIDDEN_SECURE_CAMERA; - } +@@ -1137,10 +1139,12 @@ SystemCameraKind CameraProviderManager::ProviderInfo::DeviceInfo3::getSystemCame + + // Go through the capabilities and check if it has + // ANDROID_REQUEST_AVAILABLE_CAPABILITIES_SYSTEM_CAMERA +- for (size_t i = 0; i < entryCap.count; ++i) { +- uint8_t capability = entryCap.data.u8[i]; +- if (capability == ANDROID_REQUEST_AVAILABLE_CAPABILITIES_SYSTEM_CAMERA) { +- return SystemCameraKind::SYSTEM_ONLY_CAMERA; + if(!property_get_bool("persist.sys.phh.include_all_cameras", false)) { + for (size_t i = 0; i < entryCap.count; ++i) { + uint8_t capability = entryCap.data.u8[i]; + if (capability == ANDROID_REQUEST_AVAILABLE_CAPABILITIES_SYSTEM_CAMERA) { + return SystemCameraKind::SYSTEM_ONLY_CAMERA; + } -+ } -+ } -+ + } + } return SystemCameraKind::PUBLIC; - } - -- -2.45.1 +2.34.1 + diff --git a/patches/trebledroid/platform_frameworks_base/0001-Disable-vendor-mismatch-warning.patch b/patches/trebledroid/platform_frameworks_base/0001-Disable-vendor-mismatch-warning.patch index 940e4736..e3e758c5 100644 --- a/patches/trebledroid/platform_frameworks_base/0001-Disable-vendor-mismatch-warning.patch +++ b/patches/trebledroid/platform_frameworks_base/0001-Disable-vendor-mismatch-warning.patch @@ -1,7 +1,7 @@ From 3e59ead9ac716dcdea0b9c0a9d7c966bca637de2 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Thu, 5 Apr 2018 10:01:19 +0800 -Subject: [PATCH 01/53] Disable vendor mismatch warning +Subject: [PATCH 01/54] Disable vendor mismatch warning Change-Id: Ieb8fe91e2f02462f074312ed0f4885d183e9780b --- diff --git a/patches/trebledroid/platform_frameworks_base/0002-Fallback-to-stupid-autobrightness-if-brightness-valu.patch b/patches/trebledroid/platform_frameworks_base/0002-Fallback-to-stupid-autobrightness-if-brightness-valu.patch index b09c9f9f..b1ce2b24 100644 --- a/patches/trebledroid/platform_frameworks_base/0002-Fallback-to-stupid-autobrightness-if-brightness-valu.patch +++ b/patches/trebledroid/platform_frameworks_base/0002-Fallback-to-stupid-autobrightness-if-brightness-valu.patch @@ -1,7 +1,7 @@ From ae164a473cb945a0e09828136c722048c44e87c9 Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Tue, 5 Oct 2021 17:59:16 -0400 -Subject: [PATCH 02/53] Fallback to stupid autobrightness if brightness values +Subject: [PATCH 02/54] Fallback to stupid autobrightness if brightness values are broken This is needed because of: diff --git a/patches/trebledroid/platform_frameworks_base/0003-Fix-env-empty-string-ANDROID_STORAGE.patch b/patches/trebledroid/platform_frameworks_base/0003-Fix-env-empty-string-ANDROID_STORAGE.patch index 86192514..93dea92c 100644 --- a/patches/trebledroid/platform_frameworks_base/0003-Fix-env-empty-string-ANDROID_STORAGE.patch +++ b/patches/trebledroid/platform_frameworks_base/0003-Fix-env-empty-string-ANDROID_STORAGE.patch @@ -1,7 +1,7 @@ From a8ffcda0fc86e2021a2e04a36ffab6f6c87fa80c Mon Sep 17 00:00:00 2001 From: Raphael Mounier Date: Sat, 6 Aug 2022 18:08:36 +0200 -Subject: [PATCH 03/53] Fix env empty string - ANDROID_STORAGE +Subject: [PATCH 03/54] Fix env empty string - ANDROID_STORAGE Huawei hi6250 define in init.hi6250.rc ANDROID_STORAGE to "", so check empty string and replace with default path. Apply change for all env directory --- diff --git a/patches/trebledroid/platform_frameworks_base/0004-Relax-requirement-for-visible-flag-to-sdcards.patch b/patches/trebledroid/platform_frameworks_base/0004-Relax-requirement-for-visible-flag-to-sdcards.patch index 9c6e0e2b..38bf51c4 100644 --- a/patches/trebledroid/platform_frameworks_base/0004-Relax-requirement-for-visible-flag-to-sdcards.patch +++ b/patches/trebledroid/platform_frameworks_base/0004-Relax-requirement-for-visible-flag-to-sdcards.patch @@ -1,7 +1,7 @@ From 2278dbb63df4a8c6db8124689e647d0273a32d1e Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Tue, 28 Nov 2017 18:28:04 +0100 -Subject: [PATCH 04/53] Relax requirement for visible flag to sdcards +Subject: [PATCH 04/54] Relax requirement for visible flag to sdcards The vast majority of sdcard readers are stable enough to be declared by the API. (I see no counter-example) @@ -13,19 +13,19 @@ Change-Id: Ia616671c03562d1eadaff5531a5c708a62d7ad3a 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java -index 7ba8d4fff82b..dd9691bd551d 100644 +index e7fae2483d16..a3bb3f9c416c 100644 --- a/services/core/java/com/android/server/StorageManagerService.java +++ b/services/core/java/com/android/server/StorageManagerService.java -@@ -1622,7 +1622,8 @@ class StorageManagerService extends IStorageManager.Stub +@@ -1621,7 +1621,8 @@ class StorageManagerService extends IStorageManager.Stub // Adoptable public disks are visible to apps, since they meet // public API requirement of being in a stable location. - if (vol.disk.isAdoptable()) { -+ // Assume all SDs match this as well ++ // Assume all SDs match this as well + if (vol.disk.isAdoptable() || vol.disk.isSd()) { vol.mountFlags |= VolumeInfo.MOUNT_FLAG_VISIBLE_FOR_WRITE; - } else if (vol.disk.isSd()) { - vol.mountFlags |= VolumeInfo.MOUNT_FLAG_VISIBLE_FOR_WRITE; + } + -- -2.45.1 +2.34.1 diff --git a/patches/trebledroid/platform_frameworks_base/0005-Don-t-crash-if-there-is-IR-HAL-is-not-declared.patch b/patches/trebledroid/platform_frameworks_base/0005-Don-t-crash-if-there-is-IR-HAL-is-not-declared.patch index 4e934db7..afc6698f 100644 --- a/patches/trebledroid/platform_frameworks_base/0005-Don-t-crash-if-there-is-IR-HAL-is-not-declared.patch +++ b/patches/trebledroid/platform_frameworks_base/0005-Don-t-crash-if-there-is-IR-HAL-is-not-declared.patch @@ -1,7 +1,7 @@ From 269a11d58455c9cf084af39046dd81c9d03de36b Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Thu, 17 May 2018 20:28:35 +0200 -Subject: [PATCH 05/53] Don't crash if there is IR HAL is not declared +Subject: [PATCH 05/54] Don't crash if there is IR HAL is not declared Change-Id: I3afded27441bbee8244d5fda544b3e6d1238dc1b --- diff --git a/patches/trebledroid/platform_frameworks_base/0006-Implement-a-persistent-property-to-override-the-defa.patch b/patches/trebledroid/platform_frameworks_base/0006-Implement-a-persistent-property-to-override-the-defa.patch index b199605d..b94811cf 100644 --- a/patches/trebledroid/platform_frameworks_base/0006-Implement-a-persistent-property-to-override-the-defa.patch +++ b/patches/trebledroid/platform_frameworks_base/0006-Implement-a-persistent-property-to-override-the-defa.patch @@ -1,40 +1,48 @@ From f13ab9cf0dd4846bffd85f894cbccd410b186004 Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Wed, 1 Jun 2022 16:56:20 -0400 -Subject: [PATCH 06/53] Implement a persistent property to override the default +Subject: [PATCH 06/54] Implement a persistent property to override the default primary camera (0) Change-Id: I49b45d00bf71d7932591b3516d49a680e1b6568b --- - core/java/android/hardware/Camera.java | 5 +++++ - core/java/android/hardware/camera2/CameraManager.java | 8 ++++++++ - 2 files changed, 13 insertions(+) + core/java/android/hardware/Camera.java | 6 ++++++ + core/java/android/hardware/camera2/CameraManager.java | 9 +++++++++ + 2 files changed, 15 insertions(+) diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java -index f2a4796b51ac..d0d7b0a6f8be 100644 +index 1c36a88726b8..3ec40136e084 100644 --- a/core/java/android/hardware/Camera.java +++ b/core/java/android/hardware/Camera.java -@@ -476,6 +476,11 @@ public class Camera { +@@ -41,6 +41,7 @@ import android.os.Message; + import android.os.Process; + import android.os.RemoteException; + import android.os.ServiceManager; ++import android.os.SystemProperties; + import android.text.TextUtils; + import android.util.Log; + import android.view.Surface; +@@ -404,6 +405,11 @@ public class Camera { * @see #open(int) */ public static Camera open() { -+ int altPrimaryCamera = SystemProperties.getInt("persist.sys.alt_primary_camera", -1); -+ if (altPrimaryCamera > 0) { -+ return new Camera(altPrimaryCamera); -+ } -+ ++ int altPrimaryCamera = SystemProperties.getInt("persist.sys.alt_primary_camera", -1); ++ if (altPrimaryCamera > 0) { ++ return new Camera(altPrimaryCamera); ++ } ++ int numberOfCameras = getNumberOfCameras(); CameraInfo cameraInfo = new CameraInfo(); for (int i = 0; i < numberOfCameras; i++) { diff --git a/core/java/android/hardware/camera2/CameraManager.java b/core/java/android/hardware/camera2/CameraManager.java -index 4a2c484b5c22..de9b262c9e6b 100644 +index d2e4a614202f..b5a00b192edc 100644 --- a/core/java/android/hardware/camera2/CameraManager.java +++ b/core/java/android/hardware/camera2/CameraManager.java -@@ -2199,6 +2199,14 @@ public final class CameraManager { +@@ -2196,6 +2196,15 @@ public final class CameraManager { } }}); -+ // HAXX: Allow overriding default primary camera (assumed to be camera 0) via property ++ // HAXX: Allow overriding default primary camera (assumed to be camera 0) via property + // Should match with libcameraservice/common/CameraProviderManager.cpp + int altPrimaryCamera = SystemProperties.getInt("persist.sys.alt_primary_camera", -1); + if (altPrimaryCamera > 0 && altPrimaryCamera < cameraIds.length) { @@ -42,9 +50,10 @@ index 4a2c484b5c22..de9b262c9e6b 100644 + cameraIds[0] = cameraIds[altPrimaryCamera]; + cameraIds[altPrimaryCamera] = origPrimary; + } ++ } public static boolean cameraStatusesContains(CameraStatus[] cameraStatuses, String id) { -- -2.45.1 +2.34.1 diff --git a/patches/trebledroid/platform_frameworks_base/0008-Re-order-services-so-that-it-works-even-without-qtag.patch b/patches/trebledroid/platform_frameworks_base/0008-Re-order-services-so-that-it-works-even-without-qtag.patch index 733cc6fd..bd6335aa 100644 --- a/patches/trebledroid/platform_frameworks_base/0008-Re-order-services-so-that-it-works-even-without-qtag.patch +++ b/patches/trebledroid/platform_frameworks_base/0008-Re-order-services-so-that-it-works-even-without-qtag.patch @@ -1,7 +1,7 @@ From fac85e674d35e50ac18cd1cfdc185dd519d78765 Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Thu, 8 Nov 2018 23:04:03 +0100 -Subject: [PATCH 08/53] Re-order services so that it works even without qtaguid +Subject: [PATCH 08/54] Re-order services so that it works even without qtaguid Change-Id: I0c0f527b3ae151d45c68f7ac6c205da3f34e74df --- diff --git a/patches/trebledroid/platform_frameworks_base/0009-Support-samsung-Pie-and-Q-light-hal.patch b/patches/trebledroid/platform_frameworks_base/0009-Support-samsung-Pie-and-Q-light-hal.patch index 946a2e88..0000928e 100644 --- a/patches/trebledroid/platform_frameworks_base/0009-Support-samsung-Pie-and-Q-light-hal.patch +++ b/patches/trebledroid/platform_frameworks_base/0009-Support-samsung-Pie-and-Q-light-hal.patch @@ -1,7 +1,7 @@ From 2b6a99ed21c92e71160931854f5a45e2360fa43a Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Sun, 24 Mar 2019 23:05:14 +0100 -Subject: [PATCH 09/53] Support samsung Pie and Q light hal +Subject: [PATCH 09/54] Support samsung Pie and Q light hal Change-Id: I01f94acd7d0672733e48854d80368f9ac6f861c6 --- diff --git a/patches/trebledroid/platform_frameworks_base/0010-Add-support-for-samsung-touch-physical-and-hover-pro.patch b/patches/trebledroid/platform_frameworks_base/0010-Add-support-for-samsung-touch-physical-and-hover-pro.patch index ac742379..4785f1b1 100644 --- a/patches/trebledroid/platform_frameworks_base/0010-Add-support-for-samsung-touch-physical-and-hover-pro.patch +++ b/patches/trebledroid/platform_frameworks_base/0010-Add-support-for-samsung-touch-physical-and-hover-pro.patch @@ -1,7 +1,7 @@ From 24910d2e595a9adb70f3db6749b010705ce0bf67 Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Mon, 12 Aug 2019 23:08:26 +0200 -Subject: [PATCH 10/53] Add support for samsung touch, physical and hover +Subject: [PATCH 10/54] Add support for samsung touch, physical and hover proximity sensor as fallback to real proximity sensor Change-Id: I7a0f8b4665c802140d19197d850b77b2a7ac1865 diff --git a/patches/trebledroid/platform_frameworks_base/0011-Always-allow-overriding-the-number-of-work-profiles.patch b/patches/trebledroid/platform_frameworks_base/0011-Always-allow-overriding-the-number-of-work-profiles.patch index 88565ccf..d6a0f2c4 100644 --- a/patches/trebledroid/platform_frameworks_base/0011-Always-allow-overriding-the-number-of-work-profiles.patch +++ b/patches/trebledroid/platform_frameworks_base/0011-Always-allow-overriding-the-number-of-work-profiles.patch @@ -1,7 +1,7 @@ From 60bcaa3b31176f2736e3805d419b4484f9ae27a8 Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Sun, 5 Apr 2020 16:32:46 +0200 -Subject: [PATCH 11/53] Always allow overriding the number of work profiles +Subject: [PATCH 11/54] Always allow overriding the number of work profiles Change-Id: I6eb09aa71663c6fbe7563e3038bffcabdba0ff6a --- diff --git a/patches/trebledroid/platform_frameworks_base/0012-HOME-deserves-to-wake-up-devices-just-as-well-as-bac.patch b/patches/trebledroid/platform_frameworks_base/0012-HOME-deserves-to-wake-up-devices-just-as-well-as-bac.patch index bbb74690..86b41570 100644 --- a/patches/trebledroid/platform_frameworks_base/0012-HOME-deserves-to-wake-up-devices-just-as-well-as-bac.patch +++ b/patches/trebledroid/platform_frameworks_base/0012-HOME-deserves-to-wake-up-devices-just-as-well-as-bac.patch @@ -1,7 +1,7 @@ From 949f4d77bff2d37774594583c233531f812d1efa Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Sat, 6 Jun 2020 18:21:56 +0200 -Subject: [PATCH 12/53] HOME deserves to wake-up devices just as well as back +Subject: [PATCH 12/54] HOME deserves to wake-up devices just as well as back and menu Change-Id: Ia562bafd8c620d00c17e8eb338e4701c6c4a3c3a diff --git a/patches/trebledroid/platform_frameworks_base/0013-Some-devices-have-proximity-sensor-reporting-NaN-as-.patch b/patches/trebledroid/platform_frameworks_base/0013-Some-devices-have-proximity-sensor-reporting-NaN-as-.patch index 15b4a08e..6bf827e6 100644 --- a/patches/trebledroid/platform_frameworks_base/0013-Some-devices-have-proximity-sensor-reporting-NaN-as-.patch +++ b/patches/trebledroid/platform_frameworks_base/0013-Some-devices-have-proximity-sensor-reporting-NaN-as-.patch @@ -1,7 +1,7 @@ From ff62e80acf055fa985ec07702b096794b1da97cb Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Tue, 29 Sep 2020 22:39:47 +0200 -Subject: [PATCH 13/53] Some devices have proximity sensor reporting NaN as max +Subject: [PATCH 13/54] Some devices have proximity sensor reporting NaN as max range for some reason. Make them behave standard way by setting 5 cm Change-Id: I3c39e3e914a05903c140235702e0480d2d58a612 diff --git a/patches/trebledroid/platform_frameworks_base/0014-Fix-brightness-range-not-being-complete-on-Samsung-d.patch b/patches/trebledroid/platform_frameworks_base/0014-Fix-brightness-range-not-being-complete-on-Samsung-d.patch index 661c8573..214492ae 100644 --- a/patches/trebledroid/platform_frameworks_base/0014-Fix-brightness-range-not-being-complete-on-Samsung-d.patch +++ b/patches/trebledroid/platform_frameworks_base/0014-Fix-brightness-range-not-being-complete-on-Samsung-d.patch @@ -1,7 +1,7 @@ From e59e6b83921f4094f154fb721c75b86cf863d471 Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Tue, 29 Sep 2020 22:40:10 +0200 -Subject: [PATCH 14/53] Fix brightness range not being complete on Samsung +Subject: [PATCH 14/54] Fix brightness range not being complete on Samsung devices On some devices, minimum brightness is 0, which totally messes with diff --git a/patches/trebledroid/platform_frameworks_base/0015-Re-implement-fnmatch-like-behaviour-for-RRO-java-sid.patch b/patches/trebledroid/platform_frameworks_base/0015-Re-implement-fnmatch-like-behaviour-for-RRO-java-sid.patch index 455a1d59..cb2f5bfb 100644 --- a/patches/trebledroid/platform_frameworks_base/0015-Re-implement-fnmatch-like-behaviour-for-RRO-java-sid.patch +++ b/patches/trebledroid/platform_frameworks_base/0015-Re-implement-fnmatch-like-behaviour-for-RRO-java-sid.patch @@ -1,28 +1,27 @@ From ede905dd269c33c4dfba408b51f910b98aba118c Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Sun, 25 Oct 2020 23:57:26 +0100 -Subject: [PATCH 15/53] Re-implement fnmatch-like behaviour for RRO java-side +Subject: [PATCH 15/54] Re-implement fnmatch-like behaviour for RRO java-side T: Also apply to FrameworkParsingPackageUtils (@PeterCxy) Change-Id: Id38292a9a1453aa87b8401c1fdb390fa4e63c7d1 --- - core/java/android/content/pm/PackageParser.java | 14 ++++++++++++-- - .../pm/parsing/FrameworkParsingPackageUtils.java | 13 +++++++++++-- - 2 files changed, 23 insertions(+), 4 deletions(-) + core/java/android/content/pm/PackageParser.java | 13 +++++++++++-- + .../pm/parsing/FrameworkParsingPackageUtils.java | 13 +++++++++++-- + 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java -index 9a95d27eb926..03117e397fa7 100644 +index 4b579e7db9f8..3bee878e2fc8 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java -@@ -2545,8 +2545,18 @@ public class PackageParser { +@@ -2545,8 +2545,17 @@ public class PackageParser { for (int i = 0; i < propNames.length; i++) { // Check property value: make sure it is both set and equal to expected value final String currValue = SystemProperties.get(propNames[i]); - if (!TextUtils.equals(currValue, propValues[i])) { - return false; + final String value = propValues[i]; -+ + if(value.startsWith("+")) { + final java.util.regex.Pattern regex = java.util.regex.Pattern.compile(value.substring(1, value.length()).replace("*", ".*")); + java.util.regex.Matcher matcher = regex.matcher(currValue); @@ -37,14 +36,14 @@ index 9a95d27eb926..03117e397fa7 100644 } return true; diff --git a/core/java/android/content/pm/parsing/FrameworkParsingPackageUtils.java b/core/java/android/content/pm/parsing/FrameworkParsingPackageUtils.java -index fc06dd8de3b6..41da26bff956 100644 +index 153dd9a93490..4eacc197b4e9 100644 --- a/core/java/android/content/pm/parsing/FrameworkParsingPackageUtils.java +++ b/core/java/android/content/pm/parsing/FrameworkParsingPackageUtils.java -@@ -223,8 +223,17 @@ public class FrameworkParsingPackageUtils { - continue; - } - // 3. Check if prop is equal to expected value. -- if (!currValue.equals(propValues[i])) { +@@ -215,8 +215,17 @@ public class FrameworkParsingPackageUtils { + for (int i = 0; i < propNames.length; i++) { + // Check property value: make sure it is both set and equal to expected value + final String currValue = SystemProperties.get(propNames[i]); +- if (!TextUtils.equals(currValue, propValues[i])) { - return false; + final String value = propValues[i]; + if(value.startsWith("+")) { @@ -61,5 +60,5 @@ index fc06dd8de3b6..41da26bff956 100644 } return true; -- -2.45.1 +2.34.1 diff --git a/patches/trebledroid/platform_frameworks_base/0016-Remove-useless-notification-about-console-service-be.patch b/patches/trebledroid/platform_frameworks_base/0016-Remove-useless-notification-about-console-service-be.patch index edf8f2b2..41a5d7f6 100644 --- a/patches/trebledroid/platform_frameworks_base/0016-Remove-useless-notification-about-console-service-be.patch +++ b/patches/trebledroid/platform_frameworks_base/0016-Remove-useless-notification-about-console-service-be.patch @@ -1,7 +1,7 @@ From 53329e4771498cbaf560e1aefdcab0232b4ebfe7 Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Fri, 11 Dec 2020 14:41:09 +0100 -Subject: [PATCH 16/53] Remove useless notification about "console" service +Subject: [PATCH 16/54] Remove useless notification about "console" service being running --- diff --git a/patches/trebledroid/platform_frameworks_base/0017-Revert-Remove-unused-SystemProperties.set.patch b/patches/trebledroid/platform_frameworks_base/0017-Revert-Remove-unused-SystemProperties.set.patch index 29ce1a6a..08d22ec7 100644 --- a/patches/trebledroid/platform_frameworks_base/0017-Revert-Remove-unused-SystemProperties.set.patch +++ b/patches/trebledroid/platform_frameworks_base/0017-Revert-Remove-unused-SystemProperties.set.patch @@ -1,7 +1,7 @@ From d8cea8e858b9e42ee3a53bc1fb8a06b78727e67c Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Wed, 16 Dec 2020 21:24:12 +0800 -Subject: [PATCH 17/53] Revert "Remove unused SystemProperties.set" +Subject: [PATCH 17/54] Revert "Remove unused SystemProperties.set" This reverts commit debb4616ef67f9ed5054eca51ec58592358ff55f. diff --git a/patches/trebledroid/platform_frameworks_base/0018-TelephonyManager-bring-back-getNetworkClass.patch b/patches/trebledroid/platform_frameworks_base/0018-TelephonyManager-bring-back-getNetworkClass.patch index 11e23c76..b4c68024 100644 --- a/patches/trebledroid/platform_frameworks_base/0018-TelephonyManager-bring-back-getNetworkClass.patch +++ b/patches/trebledroid/platform_frameworks_base/0018-TelephonyManager-bring-back-getNetworkClass.patch @@ -1,7 +1,7 @@ From 889de7902ffd8664328d3bf01c1d00c22f68e1d9 Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Wed, 16 Dec 2020 13:46:15 +0800 -Subject: [PATCH 18/53] TelephonyManager: bring back getNetworkClass() +Subject: [PATCH 18/54] TelephonyManager: bring back getNetworkClass() This partially reverts commit c058cac051ab083dc7fb7ea6aa85699110b2e9bf. @@ -11,13 +11,10 @@ This partially reverts commit c058cac051ab083dc7fb7ea6aa85699110b2e9bf. 1 file changed, 58 insertions(+) diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java -index ce3563d93a13..06d2faefbf58 100644 +index 9d2ea48dce30..0c1857754fd5 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java -@@ -3348,12 +3348,70 @@ public class TelephonyManager { - } catch (NullPointerException ex) { - // This could happen before phone restarts due to crashing - return NETWORK_TYPE_UNKNOWN; +@@ -3351,6 +3351,64 @@ public class TelephonyManager { } } @@ -78,12 +75,10 @@ index ce3563d93a13..06d2faefbf58 100644 + return NETWORK_CLASS_UNKNOWN; + } + } -+ ++ /** * Returns a string representation of the radio technology (network type) * currently in use on the device. - * @return the name of the radio technology - * - * @hide pending API council review -- -2.45.1 +2.34.1 + diff --git a/patches/trebledroid/platform_frameworks_base/0019-TelephonyManager-add-API-annotations-for-setTelephon.patch b/patches/trebledroid/platform_frameworks_base/0019-TelephonyManager-add-API-annotations-for-setTelephon.patch index db5915af..f9b9ec9e 100644 --- a/patches/trebledroid/platform_frameworks_base/0019-TelephonyManager-add-API-annotations-for-setTelephon.patch +++ b/patches/trebledroid/platform_frameworks_base/0019-TelephonyManager-add-API-annotations-for-setTelephon.patch @@ -1,7 +1,7 @@ From 5532c13ae6f101786c3271126d8cdf7240fd72a9 Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Wed, 16 Dec 2020 21:26:45 +0800 -Subject: [PATCH 19/53] TelephonyManager: add API annotations for +Subject: [PATCH 19/54] TelephonyManager: add API annotations for setTelephonyProperty * This method was added back by reverting commit diff --git a/patches/trebledroid/platform_frameworks_base/0021-Automatically-detect-pick-up-sensor-so-that-an-overl.patch b/patches/trebledroid/platform_frameworks_base/0021-Automatically-detect-pick-up-sensor-so-that-an-overl.patch index 01f669c5..be16098d 100644 --- a/patches/trebledroid/platform_frameworks_base/0021-Automatically-detect-pick-up-sensor-so-that-an-overl.patch +++ b/patches/trebledroid/platform_frameworks_base/0021-Automatically-detect-pick-up-sensor-so-that-an-overl.patch @@ -1,7 +1,7 @@ From bd0c7445a8e30b1834f167e8fb6844c5eaedf2dc Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Sat, 20 Mar 2021 14:31:01 +0100 -Subject: [PATCH 21/53] Automatically detect pick up sensor, so that an overlay +Subject: [PATCH 21/54] Automatically detect pick up sensor, so that an overlay is required for the sole purpose of enabling pulse doze on pick up sensor --- diff --git a/patches/trebledroid/platform_frameworks_base/0022-Catch-broken-mainBuiltInDisplayCutoutRectApproximati.patch b/patches/trebledroid/platform_frameworks_base/0022-Catch-broken-mainBuiltInDisplayCutoutRectApproximati.patch index b65dcd6c..29a5522d 100644 --- a/patches/trebledroid/platform_frameworks_base/0022-Catch-broken-mainBuiltInDisplayCutoutRectApproximati.patch +++ b/patches/trebledroid/platform_frameworks_base/0022-Catch-broken-mainBuiltInDisplayCutoutRectApproximati.patch @@ -1,7 +1,7 @@ From b0bc2cfb2167e78ec75d570050352bc50b30fa1b Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Tue, 23 Mar 2021 19:43:26 +0100 -Subject: [PATCH 22/53] Catch broken mainBuiltInDisplayCutoutRectApproximation +Subject: [PATCH 22/54] Catch broken mainBuiltInDisplayCutoutRectApproximation Some devices (Redmi Note 9T) have: mainBuiltInDisplayCutoutRectApproximation = @android:mainBuiltInDisplayCutout diff --git a/patches/trebledroid/platform_frameworks_base/0023-backlight-Fix-backlight-control-on-Galaxy-S9.patch b/patches/trebledroid/platform_frameworks_base/0023-backlight-Fix-backlight-control-on-Galaxy-S9.patch index f8067207..9cc78265 100644 --- a/patches/trebledroid/platform_frameworks_base/0023-backlight-Fix-backlight-control-on-Galaxy-S9.patch +++ b/patches/trebledroid/platform_frameworks_base/0023-backlight-Fix-backlight-control-on-Galaxy-S9.patch @@ -1,7 +1,7 @@ From f6529956526ad8bff7e3309f9d987f67bd5af829 Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Sat, 24 Mar 2018 08:01:48 +0100 -Subject: [PATCH 23/53] backlight: Fix backlight control on Galaxy S9(+) +Subject: [PATCH 23/54] backlight: Fix backlight control on Galaxy S9(+) Change-Id: I1fbbb47939c377597ef8ad6b88b2acea5f4acaa6 diff --git a/patches/trebledroid/platform_frameworks_base/0024-Revert-Switch-long-press-power-behavior-in-AOSP.patch b/patches/trebledroid/platform_frameworks_base/0024-Revert-Switch-long-press-power-behavior-in-AOSP.patch index 226004eb..144a14d4 100644 --- a/patches/trebledroid/platform_frameworks_base/0024-Revert-Switch-long-press-power-behavior-in-AOSP.patch +++ b/patches/trebledroid/platform_frameworks_base/0024-Revert-Switch-long-press-power-behavior-in-AOSP.patch @@ -1,7 +1,7 @@ From 85e659c511cd04c9c38d4dd8ef31a2aa754d69cc Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sat, 4 Sep 2021 08:26:30 +0000 -Subject: [PATCH 24/53] Revert "Switch long-press power behavior in AOSP." +Subject: [PATCH 24/54] Revert "Switch long-press power behavior in AOSP." This reverts commit 803c77a0a24624111944832098c6f65158051dc4. --- @@ -9,17 +9,27 @@ This reverts commit 803c77a0a24624111944832098c6f65158051dc4. 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml -index d1fa97605157..ca21d63362a0 100644 +index 8edf42afa730..7af64afa620a 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml -@@ -1180,7 +1180,7 @@ +@@ -1146,7 +1146,7 @@ + 4 - Go to voice assist + 5 - Go to assistant (Settings.Secure.ASSISTANT) + --> +- 5 ++ 1 + + + 500 +@@ -1178,7 +1178,7 @@ 1 - Mute toggle 2 - Global actions menu --> -- 1 -+ 2 +- 2 ++ 1