From a3807ca12d047916c5fc62fefedd27513f21b694 Mon Sep 17 00:00:00 2001 From: Tad Date: Wed, 12 Apr 2023 20:37:43 -0400 Subject: [PATCH] Picks + churn Signed-off-by: Tad --- .../android_external_libnfc-nci/353760.patch | 2 +- .../android_frameworks_base/353756.patch | 12 ++++++------ .../android_frameworks_base/353757.patch | 6 +++--- .../android_frameworks_base/353758.patch | 12 ++++++------ .../android_frameworks_base/353759.patch | 6 +++--- .../LineageOS-14.1/android_system_bt/353754.patch | 4 ++-- .../LineageOS-14.1/android_system_bt/353755.patch | 6 +++--- .../0004-Fingerprint_Lockout.patch | 2 +- .../0007-Always_Restict_Serial.patch | 2 +- .../0001-Random_MAC.patch | 2 +- Scripts/LineageOS-19.1/Functions.sh | 3 ++- Scripts/LineageOS-19.1/Patch.sh | 4 ++++ 12 files changed, 33 insertions(+), 28 deletions(-) diff --git a/Patches/LineageOS-14.1/android_external_libnfc-nci/353760.patch b/Patches/LineageOS-14.1/android_external_libnfc-nci/353760.patch index 940eb6f8..da9bed5d 100644 --- a/Patches/LineageOS-14.1/android_external_libnfc-nci/353760.patch +++ b/Patches/LineageOS-14.1/android_external_libnfc-nci/353760.patch @@ -1,4 +1,4 @@ -From 86e2cbf8227fff2b020ba5ff858d054318044916 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Alisher Alikhodjaev Date: Tue, 31 Jan 2023 19:04:09 -0800 Subject: [PATCH] OOBW in nci_snd_set_routing_cmd() diff --git a/Patches/LineageOS-14.1/android_frameworks_base/353756.patch b/Patches/LineageOS-14.1/android_frameworks_base/353756.patch index b2822d52..2544e7c7 100644 --- a/Patches/LineageOS-14.1/android_frameworks_base/353756.patch +++ b/Patches/LineageOS-14.1/android_frameworks_base/353756.patch @@ -1,4 +1,4 @@ -From 6dbd9ee40a5c13e8e4a5b1aca039bb6c00031501 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jing Ji Date: Thu, 4 Aug 2022 11:36:26 -0700 Subject: [PATCH] DO NOT MERGE: Context#startInstrumentation could be started @@ -23,10 +23,10 @@ Merged-In: I7ca7345b064e8e74f7037b8fa3ed45bb6423e406 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java -index 4e48f422a2fe3..73ecd14090c99 100644 +index 4b7cb9bac5af..8f26804d51bd 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java -@@ -4306,6 +4306,29 @@ public int getPackageProcessState(String packageName, String callingPackage) { +@@ -4306,6 +4306,29 @@ public final class ActivityManagerService extends ActivityManagerNative return procState; } @@ -56,7 +56,7 @@ index 4e48f422a2fe3..73ecd14090c99 100644 private boolean isCallerShell() { final int callingUid = Binder.getCallingUid(); return callingUid == Process.SHELL_UID || callingUid == Process.ROOT_UID; -@@ -18947,7 +18970,9 @@ public boolean startInstrumentation(ComponentName className, +@@ -18949,7 +18972,9 @@ public final class ActivityManagerService extends ActivityManagerNative IInstrumentationWatcher watcher, IUiAutomationConnection uiAutomationConnection, int userId, String abiOverride) { enforceNotIsolatedCaller("startInstrumentation"); @@ -67,7 +67,7 @@ index 4e48f422a2fe3..73ecd14090c99 100644 userId, false, ALLOW_FULL_ONLY, "startInstrumentation", null); // Refuse possible leaked file descriptors if (arguments != null && arguments.hasFileDescriptors()) { -@@ -18987,7 +19012,7 @@ public boolean startInstrumentation(ComponentName className, +@@ -18989,7 +19014,7 @@ public final class ActivityManagerService extends ActivityManagerNative String msg = "Permission Denial: starting instrumentation " + className + " from pid=" + Binder.getCallingPid() @@ -76,7 +76,7 @@ index 4e48f422a2fe3..73ecd14090c99 100644 + " not allowed because package " + ii.packageName + " does not have a signature matching the target " + ii.targetPackage; -@@ -18995,6 +19020,18 @@ public boolean startInstrumentation(ComponentName className, +@@ -18997,6 +19022,18 @@ public final class ActivityManagerService extends ActivityManagerNative throw new SecurityException(msg); } diff --git a/Patches/LineageOS-14.1/android_frameworks_base/353757.patch b/Patches/LineageOS-14.1/android_frameworks_base/353757.patch index e583e68e..974728a1 100644 --- a/Patches/LineageOS-14.1/android_frameworks_base/353757.patch +++ b/Patches/LineageOS-14.1/android_frameworks_base/353757.patch @@ -1,4 +1,4 @@ -From 1168540ec2ed0fa57c19f5a5033c6fd7cbf74a25 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Kunal Malhotra Date: Mon, 7 Nov 2022 23:33:55 +0000 Subject: [PATCH] Checking if package belongs to UID before registering @@ -16,10 +16,10 @@ Merged-In: Ia525f218a46f8bf7fff660cec0d6432f09fdf24d 1 file changed, 5 insertions(+) diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java -index c38dad9125de5..cb3fb9f5abbe0 100755 +index c38dad9125de..cb3fb9f5abbe 100755 --- a/services/core/java/com/android/server/am/ActiveServices.java +++ b/services/core/java/com/android/server/am/ActiveServices.java -@@ -1326,6 +1326,11 @@ private ServiceLookupResult retrieveServiceLocked(Intent service, +@@ -1326,6 +1326,11 @@ public final class ActiveServices { throw new SecurityException("BIND_EXTERNAL_SERVICE failed, " + name + " is not an isolatedProcess"); } diff --git a/Patches/LineageOS-14.1/android_frameworks_base/353758.patch b/Patches/LineageOS-14.1/android_frameworks_base/353758.patch index 8d11fca1..22ddbb34 100644 --- a/Patches/LineageOS-14.1/android_frameworks_base/353758.patch +++ b/Patches/LineageOS-14.1/android_frameworks_base/353758.patch @@ -1,4 +1,4 @@ -From c7267fd43b5a9aa80f218fb5c09385269925b073 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Hao Ke Date: Mon, 12 Dec 2022 15:49:16 +0000 Subject: [PATCH] Fix checkKeyIntentParceledCorrectly's bypass @@ -22,10 +22,10 @@ Merged-In: I7b528f52c41767ae12731838fdd36aa26a8f3477 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java -index 1692367c70a1..9aef2cc347d2 100644 +index 7273e3ea5ffc..b27f9b08c05e 100644 --- a/services/core/java/com/android/server/accounts/AccountManagerService.java +++ b/services/core/java/com/android/server/accounts/AccountManagerService.java -@@ -2936,8 +2936,7 @@ public void onResult(Bundle result) { +@@ -2957,8 +2957,7 @@ public class AccountManagerService Bundle.setDefusable(result, true); mNumResults++; Intent intent = null; @@ -35,7 +35,7 @@ index 1692367c70a1..9aef2cc347d2 100644 if (!checkKeyIntent( Binder.getCallingUid(), result)) { -@@ -4215,8 +4214,10 @@ protected boolean checkKeyIntent(int authUid, Bundle bundle) { +@@ -4236,8 +4235,10 @@ public class AccountManagerService EventLog.writeEvent(0x534e4554, "250588548", authUid, ""); return false; } @@ -47,7 +47,7 @@ index 1692367c70a1..9aef2cc347d2 100644 // Explicitly set an empty ClipData to ensure that we don't offer to // promote any Uris contained inside for granting purposes if (intent.getClipData() == null) { -@@ -4265,7 +4266,10 @@ private boolean checkKeyIntentParceledCorrectly(Bundle bundle) { +@@ -4286,7 +4287,10 @@ public class AccountManagerService p.recycle(); Intent intent = bundle.getParcelable(AccountManager.KEY_INTENT); Intent simulateIntent = simulateBundle.getParcelable(AccountManager.KEY_INTENT); @@ -59,7 +59,7 @@ index 1692367c70a1..9aef2cc347d2 100644 } private void close() { -@@ -4409,8 +4413,7 @@ public void onResult(Bundle result) { +@@ -4430,8 +4434,7 @@ public class AccountManagerService } } } diff --git a/Patches/LineageOS-14.1/android_frameworks_base/353759.patch b/Patches/LineageOS-14.1/android_frameworks_base/353759.patch index 54503638..809625a1 100644 --- a/Patches/LineageOS-14.1/android_frameworks_base/353759.patch +++ b/Patches/LineageOS-14.1/android_frameworks_base/353759.patch @@ -1,4 +1,4 @@ -From ff21c932b70b820c32a3a5331128a85e382f9885 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Winson Chiu Date: Fri, 6 Jan 2023 21:26:24 +0000 Subject: [PATCH] Encode Intent scheme when serializing to URI string RESTRICT @@ -20,10 +20,10 @@ Merged-In: Ic34b3f796b762763db5aa7b5d7c109ae70607470 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java -index 2142aae2ec74a..0059f9edb6e15 100644 +index 2142aae2ec74..0059f9edb6e1 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java -@@ -8602,7 +8602,7 @@ private void toUriFragment(StringBuilder uri, String scheme, String defAction, +@@ -8602,7 +8602,7 @@ public class Intent implements Parcelable, Cloneable { private void toUriInner(StringBuilder uri, String scheme, String defAction, String defPackage, int flags) { if (scheme != null) { diff --git a/Patches/LineageOS-14.1/android_system_bt/353754.patch b/Patches/LineageOS-14.1/android_system_bt/353754.patch index c3b914f4..ba4df9c5 100644 --- a/Patches/LineageOS-14.1/android_system_bt/353754.patch +++ b/Patches/LineageOS-14.1/android_system_bt/353754.patch @@ -1,4 +1,4 @@ -From cb6a14a070dbaf85a8fb0db89531aef3e091711b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Cheney Ni Date: Fri, 1 Oct 2021 20:44:20 +0800 Subject: [PATCH] AVDTP: Fix a potential overflow about the media payload @@ -18,7 +18,7 @@ Change-Id: Id13b1ebde8f603123c8b7a49922b2f1378ab788f 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/stack/avdt/avdt_scb_act.c b/stack/avdt/avdt_scb_act.c -index d7cf791ccf..6b6d708f77 100644 +index 5537c3d1d..011bff1c5 100644 --- a/stack/avdt/avdt_scb_act.c +++ b/stack/avdt/avdt_scb_act.c @@ -291,19 +291,26 @@ void avdt_scb_hdl_pkt_no_frag(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data) diff --git a/Patches/LineageOS-14.1/android_system_bt/353755.patch b/Patches/LineageOS-14.1/android_system_bt/353755.patch index 29619949..40c11030 100644 --- a/Patches/LineageOS-14.1/android_system_bt/353755.patch +++ b/Patches/LineageOS-14.1/android_system_bt/353755.patch @@ -1,4 +1,4 @@ -From 1f57f8785858f189bf3aa005f4e0cb92388d5d2c Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Hui Peng Date: Fri, 20 Jan 2023 19:39:30 +0000 Subject: [PATCH] Fix an OOB bug in register_notification_rsp @@ -17,10 +17,10 @@ Merged-In: I37a9f45e707702b2ec52b5a2d572f177f2911765 1 file changed, 7 insertions(+) diff --git a/btif/src/btif_rc.c b/btif/src/btif_rc.c -index 632ec9c33d..b42df67b11 100644 +index 7f17a5191..af752d8dc 100644 --- a/btif/src/btif_rc.c +++ b/btif/src/btif_rc.c -@@ -3170,6 +3170,13 @@ static bt_status_t register_notification_rsp(btrc_event_id_t event_id, +@@ -3171,6 +3171,13 @@ static bt_status_t register_notification_rsp(btrc_event_id_t event_id, BTIF_TRACE_ERROR("Avrcp Event id not registered: event_id = %x", event_id); return BT_STATUS_NOT_READY; } diff --git a/Patches/LineageOS-19.1/android_frameworks_base/0004-Fingerprint_Lockout.patch b/Patches/LineageOS-19.1/android_frameworks_base/0004-Fingerprint_Lockout.patch index 228e365b..540e77cb 100644 --- a/Patches/LineageOS-19.1/android_frameworks_base/0004-Fingerprint_Lockout.patch +++ b/Patches/LineageOS-19.1/android_frameworks_base/0004-Fingerprint_Lockout.patch @@ -9,7 +9,7 @@ Signed-off-by: anupritaisno1 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/LockoutFrameworkImpl.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/LockoutFrameworkImpl.java -index dc5dace98825..efee4843aa99 100644 +index dc5dace98825..2f7452644227 100644 --- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/LockoutFrameworkImpl.java +++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/LockoutFrameworkImpl.java @@ -41,7 +41,7 @@ public class LockoutFrameworkImpl implements LockoutTracker { diff --git a/Patches/LineageOS-19.1/android_frameworks_base/0007-Always_Restict_Serial.patch b/Patches/LineageOS-19.1/android_frameworks_base/0007-Always_Restict_Serial.patch index 27882107..64ff1233 100644 --- a/Patches/LineageOS-19.1/android_frameworks_base/0007-Always_Restict_Serial.patch +++ b/Patches/LineageOS-19.1/android_frameworks_base/0007-Always_Restict_Serial.patch @@ -10,7 +10,7 @@ requiring the READ_PHONE_STATE permission. 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java -index d8508eac22ed..c9b158987403 100644 +index 336433bbad89..d09291162c8d 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -4482,12 +4482,7 @@ public class ActivityManagerService extends IActivityManager.Stub diff --git a/Patches/LineageOS-19.1/android_packages_modules_Wifi/0001-Random_MAC.patch b/Patches/LineageOS-19.1/android_packages_modules_Wifi/0001-Random_MAC.patch index 69a5038a..b1110ef4 100644 --- a/Patches/LineageOS-19.1/android_packages_modules_Wifi/0001-Random_MAC.patch +++ b/Patches/LineageOS-19.1/android_packages_modules_Wifi/0001-Random_MAC.patch @@ -64,7 +64,7 @@ index 924cd3345..fa96b73c0 100644 /** * Randomized MAC address to use with this particular network diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java -index 1c87eb2fa..9032bfb54 100644 +index b0212133a..5f40104ce 100644 --- a/service/java/com/android/server/wifi/WifiConfigManager.java +++ b/service/java/com/android/server/wifi/WifiConfigManager.java @@ -431,6 +431,10 @@ public class WifiConfigManager { diff --git a/Scripts/LineageOS-19.1/Functions.sh b/Scripts/LineageOS-19.1/Functions.sh index a94d2436..12c1ac88 100644 --- a/Scripts/LineageOS-19.1/Functions.sh +++ b/Scripts/LineageOS-19.1/Functions.sh @@ -73,9 +73,10 @@ patchWorkspaceReal() { verifyAllPlatformTags; gpgVerifyGitHead "$DOS_BUILD_BASE/external/chromium-webview"; - #source build/envsetup.sh; + source build/envsetup.sh; #repopick -ift twelve-bt-sbc-hd-dualchannel; #repopick -it twelve-colors; + repopick -it S_asb_2023-04; sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh"; diff --git a/Scripts/LineageOS-19.1/Patch.sh b/Scripts/LineageOS-19.1/Patch.sh index f4b51c08..c051b303 100644 --- a/Scripts/LineageOS-19.1/Patch.sh +++ b/Scripts/LineageOS-19.1/Patch.sh @@ -104,6 +104,10 @@ applyPatch "$DOS_PATCHES/android_build_soong/0001-Enable_fwrapv.patch"; #Use -fw if [ "$DOS_GRAPHENE_MALLOC" = true ]; then applyPatch "$DOS_PATCHES/android_build_soong/0002-hm_apex.patch"; fi; #(GrapheneOS) fi; +if enterAndClear "external/angle"; then +git fetch https://github.com/LineageOS/android_external_angle refs/changes/86/353786/1 && git cherry-pick FETCH_HEAD; #S_asb_2023-04 +fi; + if enterAndClear "external/chromium-webview"; then if [ "$(type -t DOS_WEBVIEW_CHERRYPICK)" = "alias" ] ; then DOS_WEBVIEW_CHERRYPICK; fi; #Update the WebView to latest if available if [ "$DOS_WEBVIEW_LFS" = true ]; then git lfs pull; fi; #Ensure the objects are available