diff --git a/frameworks/opt/net/ims/0001-Pie-MTK-IMS-calls-static-ImsManager.updateImsService.patch b/frameworks/opt/net/ims/0001-Pie-MTK-IMS-calls-static-ImsManager.updateImsService.patch index 732d74a..9fffba3 100644 --- a/frameworks/opt/net/ims/0001-Pie-MTK-IMS-calls-static-ImsManager.updateImsService.patch +++ b/frameworks/opt/net/ims/0001-Pie-MTK-IMS-calls-static-ImsManager.updateImsService.patch @@ -1,4 +1,4 @@ -From 45ee12fd0ac92b5e6a07de927716b8b03c18f1fd Mon Sep 17 00:00:00 2001 +From c776ae5c5e002aa824137df6b367b5873cb23fcf Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Sun, 14 Nov 2021 13:47:29 -0500 Subject: [PATCH] Pie MTK IMS calls static @@ -10,10 +10,10 @@ Change-Id: I3dd66d436629d37c8ec795df6569736195ae570e 1 file changed, 8 insertions(+) diff --git a/src/java/com/android/ims/ImsManager.java b/src/java/com/android/ims/ImsManager.java -index b5a1168b..547a3a16 100644 +index 217a26f..b687e4b 100644 --- a/src/java/com/android/ims/ImsManager.java +++ b/src/java/com/android/ims/ImsManager.java -@@ -1666,6 +1666,14 @@ public class ImsManager implements FeatureUpdates { +@@ -1679,6 +1679,14 @@ public class ImsManager implements FeatureUpdates { } } @@ -29,5 +29,5 @@ index b5a1168b..547a3a16 100644 * Push configuration updates to the ImsService implementation. */ -- -2.41.0 +2.44.0 diff --git a/frameworks/opt/telephony/0001-Reintroduce-public-void-TelephonyMetrics.writeRilSen.patch b/frameworks/opt/telephony/0001-Reintroduce-public-void-TelephonyMetrics.writeRilSen.patch index c36dff6..2c9d0e9 100644 --- a/frameworks/opt/telephony/0001-Reintroduce-public-void-TelephonyMetrics.writeRilSen.patch +++ b/frameworks/opt/telephony/0001-Reintroduce-public-void-TelephonyMetrics.writeRilSen.patch @@ -1,4 +1,4 @@ -From ab08eec99a802be5014b876823cab89c2d2e9ef6 Mon Sep 17 00:00:00 2001 +From 5c72e94d6d8822bae2a5dbfaaf47f4631bade8ae Mon Sep 17 00:00:00 2001 From: ironydelerium <42721860+ironydelerium@users.noreply.github.com> Date: Fri, 31 Dec 2021 02:20:28 -0800 Subject: [PATCH 1/4] Reintroduce 'public void @@ -18,7 +18,7 @@ Co-authored-by: Sarah Vandomelen 1 file changed, 13 insertions(+) diff --git a/src/java/com/android/internal/telephony/metrics/TelephonyMetrics.java b/src/java/com/android/internal/telephony/metrics/TelephonyMetrics.java -index 3fdbfe0ed7..fb8011c3df 100644 +index 3fdbfe0..fb8011c 100644 --- a/src/java/com/android/internal/telephony/metrics/TelephonyMetrics.java +++ b/src/java/com/android/internal/telephony/metrics/TelephonyMetrics.java @@ -2320,6 +2320,19 @@ public class TelephonyMetrics { @@ -42,5 +42,5 @@ index 3fdbfe0ed7..fb8011c3df 100644 * Write Send SMS event using ImsService. Expecting response from * {@link #writeOnSmsSolicitedResponse}. -- -2.43.1 +2.44.0 diff --git a/frameworks/opt/telephony/0002-Fix-baseband-being-too-long-to-fit-into-a-91-chars-p.patch b/frameworks/opt/telephony/0002-Fix-baseband-being-too-long-to-fit-into-a-91-chars-p.patch index 0426c7b..0bb1e27 100644 --- a/frameworks/opt/telephony/0002-Fix-baseband-being-too-long-to-fit-into-a-91-chars-p.patch +++ b/frameworks/opt/telephony/0002-Fix-baseband-being-too-long-to-fit-into-a-91-chars-p.patch @@ -1,4 +1,4 @@ -From ca7d875358b275da98fcd55d583a9121bb68f309 Mon Sep 17 00:00:00 2001 +From 2d369615a75bee5933d927874d25e8e758a52f2d Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Mon, 6 Dec 2021 16:28:22 -0500 Subject: [PATCH 2/4] Fix baseband being too long to fit into a 91 chars @@ -10,10 +10,10 @@ Change-Id: I1762e4a8cc137626be89f350229d6be162bdaf57 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/java/com/android/internal/telephony/GsmCdmaPhone.java b/src/java/com/android/internal/telephony/GsmCdmaPhone.java -index 620b8711e2..951ef23115 100644 +index 93a0c2f..2cabeb6 100644 --- a/src/java/com/android/internal/telephony/GsmCdmaPhone.java +++ b/src/java/com/android/internal/telephony/GsmCdmaPhone.java -@@ -3373,7 +3373,7 @@ public class GsmCdmaPhone extends Phone { +@@ -3444,7 +3444,7 @@ public class GsmCdmaPhone extends Phone { String version = (String)ar.result; if (version != null) { int length = version.length(); @@ -23,5 +23,5 @@ index 620b8711e2..951ef23115 100644 length <= MAX_VERSION_LEN ? version : version.substring(length - MAX_VERSION_LEN, length)); -- -2.43.1 +2.44.0 diff --git a/frameworks/opt/telephony/0003-Conditionally-revert-Block-Binder-thread-until-incom.patch b/frameworks/opt/telephony/0003-Conditionally-revert-Block-Binder-thread-until-incom.patch index eb703a0..23a62de 100644 --- a/frameworks/opt/telephony/0003-Conditionally-revert-Block-Binder-thread-until-incom.patch +++ b/frameworks/opt/telephony/0003-Conditionally-revert-Block-Binder-thread-until-incom.patch @@ -1,4 +1,4 @@ -From 8a28ea8c3ecb378dba2aff1d93e87095d71df873 Mon Sep 17 00:00:00 2001 +From 0a4d81b29a66003ed09fab955e898908e9f6edd6 Mon Sep 17 00:00:00 2001 From: ExactExampl Date: Tue, 11 Oct 2022 12:38:00 +0300 Subject: [PATCH 3/4] Conditionally revert "Block Binder thread until incoming @@ -17,7 +17,7 @@ Change-Id: I55a8f3bbca4a2b9a6bc7511e9fe2d0884a8818e5 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java b/src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java -index e95433c2ee..7e4fdf6b41 100644 +index e73eafd..2cf59c7 100644 --- a/src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java +++ b/src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java @@ -70,6 +70,7 @@ import android.os.Registrant; @@ -50,5 +50,5 @@ index e95433c2ee..7e4fdf6b41 100644 @Override -- -2.43.1 +2.44.0 diff --git a/frameworks/opt/telephony/0004-SubscriptionController-Do-not-override-default-calli.patch b/frameworks/opt/telephony/0004-SubscriptionController-Do-not-override-default-calli.patch index 391932b..ca1d37a 100644 --- a/frameworks/opt/telephony/0004-SubscriptionController-Do-not-override-default-calli.patch +++ b/frameworks/opt/telephony/0004-SubscriptionController-Do-not-override-default-calli.patch @@ -1,4 +1,4 @@ -From d7626b9015a9505c225254dcf36e5472f4c4e4a8 Mon Sep 17 00:00:00 2001 +From d23d744b546bc88cd6489f9bcd39d001855cf2b8 Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Mon, 5 Sep 2022 14:02:37 -0400 Subject: [PATCH 4/4] SubscriptionController: Do not override default calling @@ -18,10 +18,10 @@ Change-Id: Iccab64e9b3b3ab4773bd8944d47c2006f229d472 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java b/src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java -index a8d05a334b..42310ccc3f 100644 +index 0e98a9e..c511b1f 100644 --- a/src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java +++ b/src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java -@@ -81,6 +81,7 @@ import android.util.Base64; +@@ -86,6 +86,7 @@ import android.util.Base64; import android.util.EventLog; import android.util.IndentingPrintWriter; import android.util.LocalLog; @@ -29,7 +29,7 @@ index a8d05a334b..42310ccc3f 100644 import com.android.internal.R; import com.android.internal.annotations.VisibleForTesting; -@@ -3023,7 +3024,22 @@ public class SubscriptionManagerService extends ISub.Stub { +@@ -3221,7 +3222,22 @@ public class SubscriptionManagerService extends ISub.Stub { TelecomManager telecomManager = mContext.getSystemService(TelecomManager.class); if (telecomManager != null) { @@ -54,5 +54,5 @@ index a8d05a334b..42310ccc3f 100644 updateDefaultSubId(); -- -2.43.1 +2.44.0 diff --git a/packages/apps/Launcher3/0001-Expose-themed-icon-setting-in-ThemePicker.patch b/packages/apps/Launcher3/0001-Expose-themed-icon-setting-in-ThemePicker.patch index a62384f..4a47169 100644 --- a/packages/apps/Launcher3/0001-Expose-themed-icon-setting-in-ThemePicker.patch +++ b/packages/apps/Launcher3/0001-Expose-themed-icon-setting-in-ThemePicker.patch @@ -1,4 +1,4 @@ -From ab27acf28b7e01c2fe9933849eaeb1622f5dfb6a Mon Sep 17 00:00:00 2001 +From dfc41a9e3661541deb16120d668a2db258ac5bdc Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Mon, 11 Oct 2021 20:48:44 -0700 Subject: [PATCH 1/3] Expose themed icon setting in ThemePicker @@ -10,7 +10,7 @@ Change-Id: I44e9288c3de13a3604b7a03857ec400753317d9a 2 files changed, 6 insertions(+) diff --git a/AndroidManifest.xml b/AndroidManifest.xml -index 4f580e0bd6..d5b14e5bb9 100644 +index 517bd6d..89291c1 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -67,6 +67,9 @@ @@ -24,7 +24,7 @@ index 4f580e0bd6..d5b14e5bb9 100644 diff --git a/quickstep/AndroidManifest-launcher.xml b/quickstep/AndroidManifest-launcher.xml -index c6e2d8cb74..1d7405e345 100644 +index c6e2d8c..1d7405e 100644 --- a/quickstep/AndroidManifest-launcher.xml +++ b/quickstep/AndroidManifest-launcher.xml @@ -65,6 +65,9 @@ @@ -38,5 +38,5 @@ index c6e2d8cb74..1d7405e345 100644 -- -2.43.1 +2.44.0 diff --git a/packages/apps/Launcher3/0003-Disable-QSB-in-BuildConfig.patch b/packages/apps/Launcher3/0002-Disable-QSB-in-BuildConfig.patch similarity index 85% rename from packages/apps/Launcher3/0003-Disable-QSB-in-BuildConfig.patch rename to packages/apps/Launcher3/0002-Disable-QSB-in-BuildConfig.patch index d15ae54..08f2328 100644 --- a/packages/apps/Launcher3/0003-Disable-QSB-in-BuildConfig.patch +++ b/packages/apps/Launcher3/0002-Disable-QSB-in-BuildConfig.patch @@ -1,7 +1,7 @@ -From a87776a7970affcfbf86a8e22d9f109869d0163f Mon Sep 17 00:00:00 2001 +From 3cdbed6a05724beff6104f6fa0bb20ff9b4e9a37 Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Fri, 7 Jul 2023 18:13:32 -0400 -Subject: [PATCH 3/3] Disable QSB in BuildConfig +Subject: [PATCH 2/3] Disable QSB in BuildConfig Change-Id: I3150ef1d9b8c161ed2a6569d1ae75bba0060b36f --- @@ -9,7 +9,7 @@ Change-Id: I3150ef1d9b8c161ed2a6569d1ae75bba0060b36f 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src_build_config/com/android/launcher3/BuildConfig.java b/src_build_config/com/android/launcher3/BuildConfig.java -index 3841969e9d..ae151abe75 100644 +index 6d4f56d..2630ec1 100644 --- a/src_build_config/com/android/launcher3/BuildConfig.java +++ b/src_build_config/com/android/launcher3/BuildConfig.java @@ -24,7 +24,7 @@ public final class BuildConfig { @@ -22,5 +22,5 @@ index 3841969e9d..ae151abe75 100644 /** * Flag to state if the widget on the top of the first screen should be shown. -- -2.43.1 +2.44.0 diff --git a/packages/apps/Launcher3/0002-Properly-expose-GridCustomizationsProvider.patch b/packages/apps/Launcher3/0003-Properly-expose-GridCustomizationsProvider.patch similarity index 75% rename from packages/apps/Launcher3/0002-Properly-expose-GridCustomizationsProvider.patch rename to packages/apps/Launcher3/0003-Properly-expose-GridCustomizationsProvider.patch index f5eb255..5c5451e 100644 --- a/packages/apps/Launcher3/0002-Properly-expose-GridCustomizationsProvider.patch +++ b/packages/apps/Launcher3/0003-Properly-expose-GridCustomizationsProvider.patch @@ -1,7 +1,7 @@ -From 910c5a085260dfd33a0a2377b03a3c0eeb647cc5 Mon Sep 17 00:00:00 2001 +From a75d769d962e2356d2685dde26141edb312c8e00 Mon Sep 17 00:00:00 2001 From: Luca Stefani Date: Fri, 1 Nov 2019 23:17:59 +0100 -Subject: [PATCH 2/3] Properly expose GridCustomizationsProvider +Subject: [PATCH 3/3] Properly expose GridCustomizationsProvider Change-Id: I8268a215257ae0e399c56ac8b44cdfdff8cc92a0 --- @@ -9,20 +9,20 @@ Change-Id: I8268a215257ae0e399c56ac8b44cdfdff8cc92a0 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/AndroidManifest-common.xml b/AndroidManifest-common.xml -index 7e824ec15c..b87972e0ac 100644 +index 80d2eac..53bdfff 100644 --- a/AndroidManifest-common.xml +++ b/AndroidManifest-common.xml @@ -138,7 +138,9 @@ -+ android:exported="true" ++ android:exported="true" + android:writePermission="${packageName}.permission.WRITE_SETTINGS" + android:readPermission="${packageName}.permission.READ_SETTINGS" /> - Show pointer while hovering + + + + + Global VPN @@ -30,7 +29,7 @@ index ef93ba71132..a83c8de557e 100644 + You need to disable all active VPN connections first to enable this diff --git a/res/xml/vpn_app_management.xml b/res/xml/vpn_app_management.xml -index dffbbbe3116..93df378fd76 100644 +index dffbbbe..93df378 100644 --- a/res/xml/vpn_app_management.xml +++ b/res/xml/vpn_app_management.xml @@ -23,6 +23,12 @@ @@ -47,7 +46,7 @@ index dffbbbe3116..93df378fd76 100644 android:key="always_on_vpn" android:title="@string/vpn_menu_lockdown" diff --git a/src/com/android/settings/vpn2/AppManagementFragment.java b/src/com/android/settings/vpn2/AppManagementFragment.java -index 00c8f5994ce..c4f447f44fb 100644 +index 00c8f59..c4f447f 100644 --- a/src/com/android/settings/vpn2/AppManagementFragment.java +++ b/src/com/android/settings/vpn2/AppManagementFragment.java @@ -27,10 +27,12 @@ import android.content.pm.ApplicationInfo; diff --git a/packages/apps/ThemePicker/0001-Add-wallpaper-privapp-whitelist.patch b/packages/apps/ThemePicker/0001-Add-wallpaper-privapp-whitelist.patch index 0133d64..53a1d81 100644 --- a/packages/apps/ThemePicker/0001-Add-wallpaper-privapp-whitelist.patch +++ b/packages/apps/ThemePicker/0001-Add-wallpaper-privapp-whitelist.patch @@ -1,4 +1,4 @@ -From 51bbaa3c11244498aec37e305716eaaa08c9fa5f Mon Sep 17 00:00:00 2001 +From 09b18fbe23c7658a5842046e8a02808c49f55651 Mon Sep 17 00:00:00 2001 From: Luca Stefani Date: Fri, 1 Nov 2019 21:14:29 +0100 Subject: [PATCH 1/4] Add wallpaper privapp whitelist @@ -11,10 +11,10 @@ Change-Id: I044b1d9201ac0b8780fc37a387f401f3dd0ddeac create mode 100644 privapp_whitelist_com.android.wallpaper.xml diff --git a/Android.bp b/Android.bp -index 8676f26c..a61ee790 100644 +index 58e6413..40e2241 100644 --- a/Android.bp +++ b/Android.bp -@@ -133,6 +133,15 @@ android_app { +@@ -140,6 +140,15 @@ android_app { platform_apis: true, manifest: "AndroidManifest.xml", additional_manifests: [":WallpaperPicker2_Manifest"], @@ -32,7 +32,7 @@ index 8676f26c..a61ee790 100644 +} diff --git a/privapp_whitelist_com.android.wallpaper.xml b/privapp_whitelist_com.android.wallpaper.xml new file mode 100644 -index 00000000..e3f3b658 +index 0000000..e3f3b65 --- /dev/null +++ b/privapp_whitelist_com.android.wallpaper.xml @@ -0,0 +1,24 @@ diff --git a/packages/apps/ThemePicker/0002-Add-wallpaper-default-permissions.patch b/packages/apps/ThemePicker/0002-Add-wallpaper-default-permissions.patch index cb81161..9104516 100644 --- a/packages/apps/ThemePicker/0002-Add-wallpaper-default-permissions.patch +++ b/packages/apps/ThemePicker/0002-Add-wallpaper-default-permissions.patch @@ -1,4 +1,4 @@ -From cc2bdac1523f69e04f4e9e919e6f9aa6056cfd01 Mon Sep 17 00:00:00 2001 +From db9fdfe26b4b012d6b56740fd8b2d47dbec3b1c6 Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Tue, 15 Sep 2020 03:27:19 +0200 Subject: [PATCH 2/4] Add wallpaper default permissions @@ -11,10 +11,10 @@ Change-Id: If43a594da31fbab9280ce45b049737f6c534b620 create mode 100644 default_permissions_com.android.wallpaper.xml diff --git a/Android.bp b/Android.bp -index a61ee790..c07b2ee1 100644 +index 40e2241..614739a 100644 --- a/Android.bp +++ b/Android.bp -@@ -133,7 +133,10 @@ android_app { +@@ -140,7 +140,10 @@ android_app { platform_apis: true, manifest: "AndroidManifest.xml", additional_manifests: [":WallpaperPicker2_Manifest"], @@ -26,7 +26,7 @@ index a61ee790..c07b2ee1 100644 overrides: ["WallpaperPicker", "WallpaperPicker2"], static_libs: ["ThemePickerApplicationLib"], } -@@ -145,3 +148,11 @@ prebuilt_etc_xml { +@@ -152,3 +155,11 @@ prebuilt_etc_xml { filename_from_src: true, sub_dir: "permissions", } @@ -40,7 +40,7 @@ index a61ee790..c07b2ee1 100644 +} diff --git a/default_permissions_com.android.wallpaper.xml b/default_permissions_com.android.wallpaper.xml new file mode 100644 -index 00000000..41b23ce1 +index 0000000..41b23ce --- /dev/null +++ b/default_permissions_com.android.wallpaper.xml @@ -0,0 +1,37 @@ diff --git a/packages/apps/ThemePicker/0003-Specify-we-read-and-write-launcher-settings.patch b/packages/apps/ThemePicker/0003-Specify-we-read-and-write-launcher-settings.patch index 5461d71..47af42f 100644 --- a/packages/apps/ThemePicker/0003-Specify-we-read-and-write-launcher-settings.patch +++ b/packages/apps/ThemePicker/0003-Specify-we-read-and-write-launcher-settings.patch @@ -1,4 +1,4 @@ -From c6f2fb731c84223bb5790241d5d901908f40f2ca Mon Sep 17 00:00:00 2001 +From b78e135aa16d74add63252ed718e6079afcde7f3 Mon Sep 17 00:00:00 2001 From: Luca Stefani Date: Fri, 1 Nov 2019 23:17:08 +0100 Subject: [PATCH 3/4] Specify we read and write launcher settings @@ -9,7 +9,7 @@ Change-Id: Ifc8196588443b007602118389ca76d34ab531f14 1 file changed, 3 insertions(+) diff --git a/AndroidManifest.xml b/AndroidManifest.xml -index 6e5844de..555d3b63 100755 +index 6e5844d..555d3b6 100755 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -60,6 +60,9 @@ diff --git a/packages/apps/ThemePicker/0004-Add-permission-for-launcher-preview-rendering.patch b/packages/apps/ThemePicker/0004-Add-permission-for-launcher-preview-rendering.patch index 6084efd..252ac50 100644 --- a/packages/apps/ThemePicker/0004-Add-permission-for-launcher-preview-rendering.patch +++ b/packages/apps/ThemePicker/0004-Add-permission-for-launcher-preview-rendering.patch @@ -1,4 +1,4 @@ -From cb6fbb5ce4555504bb2bf317a694f52a1c2dcd6a Mon Sep 17 00:00:00 2001 +From 4ccfc277b6a3a2b534dc331eada45b15a154a55c Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Tue, 5 Oct 2021 22:40:58 -0700 Subject: [PATCH 4/4] Add permission for launcher preview rendering @@ -10,7 +10,7 @@ Change-Id: Ie707dcd98161e8f5993b0504295fddc3f395cd20 2 files changed, 2 insertions(+) diff --git a/AndroidManifest.xml b/AndroidManifest.xml -index 555d3b63..02fa70f1 100755 +index 555d3b6..02fa70f 100755 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -13,6 +13,7 @@ @@ -22,7 +22,7 @@ index 555d3b63..02fa70f1 100755 diff --git a/privapp_whitelist_com.android.wallpaper.xml b/privapp_whitelist_com.android.wallpaper.xml -index e3f3b658..47133be8 100644 +index e3f3b65..47133be 100644 --- a/privapp_whitelist_com.android.wallpaper.xml +++ b/privapp_whitelist_com.android.wallpaper.xml @@ -20,5 +20,6 @@