Rebase entire patches

evo.mk

@@ -19,3 +19,6 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
 
 PRODUCT_PACKAGES += \
     GCamGOPrebuilt-V3
+
+DEVICE_PACKAGE_OVERLAYS += \
+    device/phh/treble/overlay-evolution

patches/personal/platform_device_phh_treble/0003-Add-Maintainer-Strings.patch

@@ -0,0 +1,36 @@
+From 35e3408aeb50c6be66922dbdb6b2e25aa8aef8fc Mon Sep 17 00:00:00 2001
+From: ahnet-69 <[email protected]>
+Date: Tue, 23 Jan 2024 11:52:17 +0000
+Subject: [PATCH] Add Maintainer Strings
+
+---
+ .../apps/Settings/res/values/strings.xml        | 17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+ create mode 100644 overlay-evolution/packages/apps/Settings/res/values/strings.xml
+
+diff --git a/overlay-evolution/packages/apps/Settings/res/values/strings.xml b/overlay-evolution/packages/apps/Settings/res/values/strings.xml
+new file mode 100644
+index 0000000..f14b444
+--- /dev/null
++++ b/overlay-evolution/packages/apps/Settings/res/values/strings.xml
+@@ -0,0 +1,17 @@
++<?xml version="1.0" encoding="utf-8"?>
++<!-- Copyright (C) 2019-2021 The Evolution X Project
++     Licensed under the Apache License, Version 2.0 (the "License");
++     you may not use this file except in compliance with the License.
++     You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
++     Unless required by applicable law or agreed to in writing, software
++     distributed under the License is distributed on an "AS IS" BASIS,
++     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++     See the License for the specific language governing permissions and
++     limitations under the License.
++-->
++<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
++
++    <string name="build_maintainer_summary">AC GSI</string>
++    <string name="build_maintainer_telegram">https://t.me/ahnetgsi</string>
++
++</resources>
+-- 
+2.34.1
+

patches/personal/platform_frameworks_native/0001-Try-to-fallback-mCallingSid-to-getpidcon.patch

@@ -0,0 +1,64 @@
+From 604b38628f5d1a562c251115bcb1393fef168100 Mon Sep 17 00:00:00 2001
+From: Pierre-Hugues Husson <[email protected]>
+Date: Wed, 20 Oct 2021 09:39:47 -0400
+Subject: [PATCH] Try to fallback mCallingSid to getpidcon
+
+This is needed because old vendors (before April 2019 ~) don't support
+reporting SELinux context of the caller.
+This doesn't work for all processes, because it requires some additional
+SELinux permissions. At the moment, only keystore2 requires this
+
+Change-Id: I3b6c4dac9d0e20a3d66f931b283e3a535ab499cd
+---
+ libs/binder/IPCThreadState.cpp | 21 +++++++++++++++++++++
+ 1 file changed, 21 insertions(+)
+
+diff --git a/libs/binder/IPCThreadState.cpp b/libs/binder/IPCThreadState.cpp
+index 5bf00f6263..347fbf12ca 100644
+--- a/libs/binder/IPCThreadState.cpp
++++ b/libs/binder/IPCThreadState.cpp
+@@ -35,6 +35,7 @@
+ #include <sched.h>
+ #include <signal.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <sys/ioctl.h>
+ #include <sys/resource.h>
+ #include <unistd.h>
+@@ -1400,6 +1401,25 @@ status_t IPCThreadState::executeCommand(int32_t cmd)
+             mHasExplicitIdentity = false;
+             mLastTransactionBinderFlags = tr.flags;
+
++            // This is recoding libselinux's getpidcon()
++            // We are in a NDK lib, so we need to keep changes to a minimum
++            bool allocatedSid = false;
++            if(mCallingSid == nullptr && mCallingPid != 0) {
++                char buf[4096];
++                char *path = NULL;
++                (void)asprintf(&path, "/proc/%d/attr/current", mCallingPid);
++                int fd = open(path, O_RDONLY | O_CLOEXEC);
++                if(fd != -1) {
++                    int readRet = read(fd, buf, sizeof(buf)-1);
++                    if(readRet != -1) {
++                        buf[readRet] = 0;
++                        mCallingSid = strdup(buf);
++                        allocatedSid = true;
++                    }
++                    close(fd);
++                }
++            }
++
+             // ALOGI(">>>> TRANSACT from pid %d sid %s uid %d\n", mCallingPid,
+             //    (mCallingSid ? mCallingSid : "<N/A>"), mCallingUid);
+
+@@ -1471,6 +1491,7 @@ status_t IPCThreadState::executeCommand(int32_t cmd)
+
+             mServingStackPointer = origServingStackPointer;
+             mCallingPid = origPid;
++            if(allocatedSid) free((void*)mCallingSid);
+             mCallingSid = origSid;
+             mCallingUid = origUid;
+             mHasExplicitIdentity = origHasExplicitIdentity;
+-- 
+2.34.1
+

patches/trebledroid/platform_bionic/0001-Disable-vndklite-handling.patch

@@ -1,4 +1,4 @@
-From cb9d1aaacaa105c20551952ead0ad7a49408efce Mon Sep 17 00:00:00 2001
+From da3e4e28f1087493239cd8991e5cfa2ff576e22f Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <[email protected]>
 Date: Wed, 27 Oct 2021 14:39:29 -0400
 Subject: [PATCH 1/2] Disable vndklite handling

patches/trebledroid/platform_bionic/0002-Add-new-mechanism-to-fake-vendor-props-on-a-per-proc.patch

@@ -1,4 +1,4 @@
-From ab1289090a65808ee3fbbeb40b0a77e91c1a6aab Mon Sep 17 00:00:00 2001
+From 79369fc64d5ccad0b668c270b25276ec5a4b7d2d Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <[email protected]>
 Date: Sat, 19 Feb 2022 08:20:25 -0500
 Subject: [PATCH 2/2] Add new mechanism to fake vendor props on a per-process

patches/trebledroid/platform_bootable_recovery/0001-Don-t-reboot-if-we-couldn-t-get-bootctrl.patch

@@ -1,4 +1,4 @@
-From 6b118b279359ded66d661bd5504cfa8a9759b4e2 Mon Sep 17 00:00:00 2001
+From 9805c3d5fd0f23b9d914ef66243d65d9c7a99e4d Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <[email protected]>
 Date: Thu, 12 Sep 2019 20:31:07 +0200
 Subject: [PATCH] Don't reboot if we couldn't get bootctrl

patches/trebledroid/platform_build/0001-build-remove-emulator-crap-from-GSI.patch

@@ -1,7 +1,7 @@
-From 7914a65a226e6e9677e869b221aa469a5c5e13c0 Mon Sep 17 00:00:00 2001
+From 59ed123b14290b2deb13fe4164b8793142fdce8d Mon Sep 17 00:00:00 2001
 From: sooti <[email protected]>
 Date: Tue, 12 Oct 2021 14:32:52 +0300
-Subject: [PATCH 1/5] build: remove emulator crap from GSI
+Subject: [PATCH 1/6] build: remove emulator crap from GSI
 
 Change-Id: Id45f3ff1d31e3d4492f956e68a1eb4b2fb82ce63
 ---

patches/trebledroid/platform_build/0002-build-Bypass-vendor-calls.patch

@@ -1,7 +1,7 @@
-From 5e102101733669fa99ed8a53f2053f8576d917d8 Mon Sep 17 00:00:00 2001
+From 4e4a4cce4742c97838ca5811bf49e2cce7de81a0 Mon Sep 17 00:00:00 2001
 From: Alberto Ponces <[email protected]>
 Date: Mon, 18 Oct 2021 17:20:18 +0100
-Subject: [PATCH 2/5] build: Bypass vendor calls
+Subject: [PATCH 2/6] build: Bypass vendor calls
 
 Change-Id: I69830d6264356dadd7b037553a899a4eb3d211f1
 ---

patches/trebledroid/platform_build/0003-Remove-init.vndk-nodef.rc.patch

@@ -1,7 +1,7 @@
-From 4bfcaea596cc197b184691accda8d73efc752558 Mon Sep 17 00:00:00 2001
+From 565248347f94ede02f0c4c33444e9d73926dc754 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <[email protected]>
 Date: Wed, 8 Dec 2021 07:04:53 +0000
-Subject: [PATCH 3/5] Remove init.vndk-nodef.rc
+Subject: [PATCH 3/6] Remove init.vndk-nodef.rc
 
 This partially reverts "Deprecate VNDK-lite support from Legacy GSI".
 
@@ -59,7 +59,7 @@ index 1b141a05e7..0000000000
 -    # Reboot if BOARD_VNDK_VERSION is not defined
 -    exec - root -- /system/bin/reboot bootloader
 diff --git a/target/product/gsi_release.mk b/target/product/gsi_release.mk
-index 3b977927d1..7bade98ca1 100644
+index 9d102ea515..ec42b2ce77 100644
 --- a/target/product/gsi_release.mk
 +++ b/target/product/gsi_release.mk
 @@ -62,7 +62,6 @@ PRODUCT_PACKAGES += com.android.apex.cts.shim.v1_with_prebuilts.flattened

patches/trebledroid/platform_build/0004-build-Remove-llkd.patch

@@ -1,7 +1,7 @@
-From b69d9d1c76a823d72a1c14128285a47f64e073be Mon Sep 17 00:00:00 2001
+From b05ec5f9d97ea7b30bb7d58ca5f92c03a5077d8d Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <[email protected]>
 Date: Thu, 14 Oct 2021 12:20:52 +0000
-Subject: [PATCH 4/5] build: Remove llkd
+Subject: [PATCH 4/6] build: Remove llkd
 
 ...until someone figures out why Genshin Impact fails it
 

patches/trebledroid/platform_build/0005-Include-vndk-v28-sepolicy-support.patch

@@ -1,7 +1,7 @@
-From 67dd639c252c6337e9ad361c364a8f799004f089 Mon Sep 17 00:00:00 2001
+From b060c1658805dd77490f070a2ceaf5ade39895fb Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <[email protected]>
 Date: Fri, 6 Oct 2023 19:11:22 -0400
-Subject: [PATCH 5/5] Include vndk v28 sepolicy support
+Subject: [PATCH 5/6] Include vndk v28 sepolicy support
 
 ---
  core/config.mk | 1 +

patches/trebledroid/platform_external_selinux/0001-Increase-default-log_level-to-get-actual-selinux-err.patch

@@ -1,4 +1,4 @@
-From aa0cbcaebbaf0886abfd6bd97232798c7cb5be9b Mon Sep 17 00:00:00 2001
+From 64cf79e704435ac07f5a35422be1a5a782ebfa81 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <[email protected]>
 Date: Mon, 9 Apr 2018 00:19:49 +0200
 Subject: [PATCH 01/10] Increase default log_level to get actual selinux error

patches/trebledroid/platform_external_selinux/0002-Revert-libsepol-Make-an-unknown-permission-an-error-.patch

@@ -1,4 +1,4 @@
-From a88a863bdd7cee7e8d8a681d7f32d9ff6d0bc746 Mon Sep 17 00:00:00 2001
+From c0a820a83a2b9646e2c833d4ca9529deec59fd99 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <[email protected]>
 Date: Wed, 9 Sep 2020 22:36:42 +0200
 Subject: [PATCH 02/10] Revert "libsepol: Make an unknown permission an error

patches/trebledroid/platform_external_selinux/0003-Workaround-device-phh-treble-conflict-with-SELinux-p.patch

@@ -1,4 +1,4 @@
-From 01034f4009d29c401d5f007f76044482c0ed8bd0 Mon Sep 17 00:00:00 2001
+From 19b12aeceee2ff520d952093eb564a5a9a6cb8b3 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <[email protected]>
 Date: Wed, 31 Mar 2021 23:32:37 +0200
 Subject: [PATCH 03/10] Workaround device/phh/treble conflict with SELinux

patches/trebledroid/platform_external_selinux/0004-Allow-devices-virtual-block-genfscon-conflict-seen-o.patch

@@ -1,4 +1,4 @@
-From 81fa34b00d80113ed4015b99dab093826c1acb89 Mon Sep 17 00:00:00 2001
+From cd03927329ace671e78faf24458c894da012c012 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <[email protected]>
 Date: Fri, 6 Sep 2019 15:07:25 +0200
 Subject: [PATCH 04/10] Allow /devices/virtual/block/ genfscon conflict (seen

patches/trebledroid/platform_external_selinux/0005-if-service-is-rcs-accept-conflict.-Seen-on-Moto-E5.patch

@@ -1,4 +1,4 @@
-From 0bc7791b9f1423f70c17b68dd7fb9d672b2bb924 Mon Sep 17 00:00:00 2001
+From c2be8303c21b99a75bb9d4f3e484b670c54c1dab Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <[email protected]>
 Date: Thu, 12 Sep 2019 20:37:04 +0200
 Subject: [PATCH 05/10] if service is "rcs", accept conflict. Seen on Moto E5

patches/trebledroid/platform_external_selinux/0006-Allow-mismatches-of-exfat-genfscon.patch

@@ -1,4 +1,4 @@
-From c4100e160008273781973b2098267e7d343b8956 Mon Sep 17 00:00:00 2001
+From 7aea91b1e670f545cb86167e1b1473b84af29eac Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <[email protected]>
 Date: Sun, 24 May 2020 17:22:22 +0200
 Subject: [PATCH 06/10] Allow mismatches of exfat genfscon

patches/trebledroid/platform_external_selinux/0007-Fix-boot-on-Moto-devices-using-unknown-class.patch

@@ -1,4 +1,4 @@
-From 4c0afb19a2170e2cd9c4e2a1fdb48cdb16d4100e Mon Sep 17 00:00:00 2001
+From 33bd3585d77cda0b7892f30be14d3721188d5424 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <[email protected]>
 Date: Fri, 25 Oct 2019 13:29:20 +0200
 Subject: [PATCH 07/10] Fix boot on Moto devices using unknown class

patches/trebledroid/platform_external_selinux/0008-Improve-SELinux-policy-workaround-on-device-phh-treb.patch

@@ -1,4 +1,4 @@
-From 18cdd4e9ff37377b80f837c92026f1ce3514d074 Mon Sep 17 00:00:00 2001
+From 6a69271d74ca04fc4edb55a82a910e3210ddafbd Mon Sep 17 00:00:00 2001
 From: ponces <[email protected]>
 Date: Mon, 7 Nov 2022 16:14:20 +0000
 Subject: [PATCH 08/10] Improve SELinux policy workaround on device/phh/treble

patches/trebledroid/platform_external_selinux/0009-Allow-sys-vm-watermark_scale_factor-conflict-seen-on.patch

@@ -1,4 +1,4 @@
-From e62c978dbf5f214f392355a0d111adc772f10b60 Mon Sep 17 00:00:00 2001
+From 8cd620d035d584906d4a7840ffe813fed9b456f9 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <[email protected]>
 Date: Thu, 20 Jul 2023 14:21:21 -0400
 Subject: [PATCH 09/10] Allow /sys/vm/watermark_scale_factor conflict -- seen

patches/trebledroid/platform_external_selinux/0010-Allow-conflict-on-fuseblk.patch

@@ -1,4 +1,4 @@
-From d69b637d22bd02e44ece4e68e53b9151dfda8247 Mon Sep 17 00:00:00 2001
+From b85e5400f0d5c46ffe96fb4b40e3c22509a40c17 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <[email protected]>
 Date: Fri, 6 Oct 2023 08:49:59 -0400
 Subject: [PATCH 10/10] Allow conflict on fuseblk

patches/trebledroid/platform_frameworks_av/0001-APM-Restore-S-R-and-Q-behavior-respectively-for-tele.patch

@@ -1,7 +1,7 @@
-From 22e5fe9453c87c2d7479a8c3da929b1b60eea764 Mon Sep 17 00:00:00 2001
+From 856407e979f3e44e686e69bddd5347b37937c847 Mon Sep 17 00:00:00 2001
 From: Peter Cai <[email protected]>
 Date: Thu, 18 Aug 2022 15:44:46 -0400
-Subject: [PATCH 01/21] APM: Restore S, R and Q behavior respectively for
+Subject: [PATCH 01/23] APM: Restore S, R and Q behavior respectively for
  telephony audio
 
 This conditionally reverts part of b2e5cb (T), 51c9cc (S) and afd4ce (R)
@@ -36,7 +36,7 @@ Change-Id: I56d36d2aef4319935cb88a3e4771b23c6d5b2145
  2 files changed, 147 insertions(+), 62 deletions(-)
 
 diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
-index f093e685ba..9a90009f9e 100644
+index b3c68b58d3..470317cb3d 100644
 --- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
 +++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
 @@ -689,6 +689,17 @@ status_t AudioPolicyManager::updateCallRoutingInternal(
@@ -148,7 +148,7 @@ index f093e685ba..9a90009f9e 100644
  bool AudioPolicyManager::isDeviceOfModule(
          const sp<DeviceDescriptor>& devDesc, const char *moduleId) const {
      sp<HwModule> module = mHwModules.getModuleFromName(moduleId);
-@@ -4958,83 +5022,101 @@ status_t AudioPolicyManager::createAudioPatchInternal(const struct audio_patch *
+@@ -5034,83 +5098,101 @@ status_t AudioPolicyManager::createAudioPatchInternal(const struct audio_patch *
                  // in config XML to reach the sink so that is can be declared as available.
                  audio_io_handle_t output = AUDIO_IO_HANDLE_NONE;
                  sp<SwAudioOutputDescriptor> outputDesc;
@@ -308,10 +308,10 @@ index f093e685ba..9a90009f9e 100644
                                      AUDIO_STREAM_PATCH;
                          patchBuilder.addSource(srcMixPortConfig);
 diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.h b/services/audiopolicy/managerdefault/AudioPolicyManager.h
-index 88bafefdb1..188b5732b3 100644
+index 863c785b08..41930138c4 100644
 --- a/services/audiopolicy/managerdefault/AudioPolicyManager.h
 +++ b/services/audiopolicy/managerdefault/AudioPolicyManager.h
-@@ -953,6 +953,9 @@ protected:
+@@ -957,6 +957,9 @@ protected:
 
          SoundTriggerSessionCollection mSoundTriggerSessions;
 

patches/trebledroid/platform_frameworks_av/0002-Fix-BT-in-call-on-CAF-devices.patch

@@ -1,7 +1,7 @@
-From 78d9273cc66e2e8760ffd278b16feeb92b311adf Mon Sep 17 00:00:00 2001
+From 12aae4541dea7fef7d80a5e3dc6a340abc3bef24 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <[email protected]>
 Date: Mon, 5 Aug 2019 18:09:50 +0200
-Subject: [PATCH 02/21] Fix BT in-call on CAF devices
+Subject: [PATCH 02/23] Fix BT in-call on CAF devices
 
 See https://github.com/phhusson/treble_experimentations/issues/374