From 566decb5ddf2a868bc1d02ad058c3a06397ed7b3 Mon Sep 17 00:00:00 2001 From: Tad Date: Tue, 8 Aug 2023 05:14:44 -0400 Subject: [PATCH] Churn Signed-off-by: Tad --- Patches/Common/apns-conf.xml | 62 +++++++++---------- .../360952-backport.patch | 9 +-- .../android_frameworks_base/360957.patch | 4 +- .../360965-backport.patch | 5 +- Scripts/Update_Commons.sh | 4 +- 5 files changed, 38 insertions(+), 46 deletions(-) diff --git a/Patches/Common/apns-conf.xml b/Patches/Common/apns-conf.xml index e56c689e..22fa644a 100644 --- a/Patches/Common/apns-conf.xml +++ b/Patches/Common/apns-conf.xml @@ -1041,20 +1041,20 @@ - + - - - - - - - - + + + + + + + + @@ -1072,7 +1072,7 @@ - + @@ -1125,10 +1125,10 @@ - - - - + + + + @@ -1233,10 +1233,10 @@ - - - - + + + + @@ -1273,9 +1273,9 @@ - - - + + + @@ -1348,7 +1348,7 @@ - + @@ -1774,8 +1774,8 @@ - - + + @@ -2875,7 +2875,7 @@ - + @@ -3222,13 +3222,13 @@ - - + + - + @@ -3288,7 +3288,7 @@ - + @@ -3395,7 +3395,7 @@ - + @@ -3614,7 +3614,7 @@ - + diff --git a/Patches/LineageOS-17.1/android_frameworks_base/360952-backport.patch b/Patches/LineageOS-17.1/android_frameworks_base/360952-backport.patch index 7f7cc9c6..46694c4f 100644 --- a/Patches/LineageOS-17.1/android_frameworks_base/360952-backport.patch +++ b/Patches/LineageOS-17.1/android_frameworks_base/360952-backport.patch @@ -1,8 +1,7 @@ -From 8bfab8e6a99bc7d61362e6ee803756a2fab08646 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "Nate(Qiang) Jiang" Date: Wed, 26 Oct 2022 21:52:34 +0000 -Subject: [PATCH 01/11] [RESTRICT AUTOMERGE] Passpoint Add more check to limit - the config size +Subject: [PATCH] Passpoint Add more check to limit the config size Bug: 245299920 Test: atest con.android.server.wifi @@ -232,7 +231,3 @@ index fc03e7eb6176..6b4f7b0cc51e 100644 private static final int CERTIFICATE_FINGERPRINT_BYTES = 32; /** --- -2.40.1 - - diff --git a/Patches/LineageOS-17.1/android_frameworks_base/360957.patch b/Patches/LineageOS-17.1/android_frameworks_base/360957.patch index 3c8916c8..5ccd61ca 100644 --- a/Patches/LineageOS-17.1/android_frameworks_base/360957.patch +++ b/Patches/LineageOS-17.1/android_frameworks_base/360957.patch @@ -13,10 +13,10 @@ Change-Id: Id4e16007531ba1ce3e3f9fa3d3111b5af57751be 1 file changed, 17 insertions(+) diff --git a/wifi/java/android/net/wifi/hotspot2/PasspointConfiguration.java b/wifi/java/android/net/wifi/hotspot2/PasspointConfiguration.java -index 9095b5d927a2..dd23e504c467 100644 +index f88d6f6ca25a..1fe66c0163b1 100644 --- a/wifi/java/android/net/wifi/hotspot2/PasspointConfiguration.java +++ b/wifi/java/android/net/wifi/hotspot2/PasspointConfiguration.java -@@ -597,6 +597,23 @@ public final class PasspointConfiguration implements Parcelable { +@@ -642,6 +642,23 @@ public final class PasspointConfiguration implements Parcelable { } } } diff --git a/Patches/LineageOS-17.1/android_frameworks_opt_net_wifi/360965-backport.patch b/Patches/LineageOS-17.1/android_frameworks_opt_net_wifi/360965-backport.patch index eae116ed..085cc7a4 100644 --- a/Patches/LineageOS-17.1/android_frameworks_opt_net_wifi/360965-backport.patch +++ b/Patches/LineageOS-17.1/android_frameworks_opt_net_wifi/360965-backport.patch @@ -1,4 +1,4 @@ -From 561ce2bb694a951fea597ad2e19844af2792186a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "Nate(Qiang) Jiang" Date: Wed, 12 Apr 2023 18:38:15 +0000 Subject: [PATCH] DO NOT MERGE: Limit the number of Passpoint per App @@ -235,6 +235,3 @@ index 618f1c3d5..2b02ed508 100644 verify(mAppOpsManager).startWatchingMode(eq(OPSTR_CHANGE_WIFI_STATE), eq(TEST_PACKAGE), mAppOpChangedListenerCaptor.capture()); --- -2.40.1 - diff --git a/Scripts/Update_Commons.sh b/Scripts/Update_Commons.sh index ebabd9cf..43d6600d 100644 --- a/Scripts/Update_Commons.sh +++ b/Scripts/Update_Commons.sh @@ -29,11 +29,11 @@ wget "https://github.com/LineageOS/android_packages_apps_LineageParts/raw/lineag #TODO: wireless-regdb #https://mirrors.edge.kernel.org/pub/software/network/wireless-regdb/ -#Last: 2023/06/17 +#Last: 2023/08/08 #TODO: MMS Configs #https://github.com/GrapheneOS/platform_packages_apps_Messaging -#Last: 2023/06/17 +#Last: 2023/08/08 #TODO: CA store #https://android.googlesource.com/platform/system/ca-certificates