From 348b392f039404290b5b80b9d2a07a735786d21e Mon Sep 17 00:00:00 2001 From: Tad Date: Mon, 3 Oct 2022 10:24:04 -0400 Subject: [PATCH] Picks Signed-off-by: Tad --- .../337992-Backport.patch | 41 ------------------- Scripts/LineageOS-16.0/Functions.sh | 1 + Scripts/LineageOS-16.0/Patch.sh | 19 +++------ Scripts/LineageOS-17.1/Functions.sh | 3 +- Scripts/LineageOS-18.1/Functions.sh | 5 ++- Scripts/LineageOS-19.1/Functions.sh | 1 + 6 files changed, 13 insertions(+), 57 deletions(-) delete mode 100644 Patches/LineageOS-16.0/android_frameworks_base/337992-Backport.patch diff --git a/Patches/LineageOS-16.0/android_frameworks_base/337992-Backport.patch b/Patches/LineageOS-16.0/android_frameworks_base/337992-Backport.patch deleted file mode 100644 index 7b42feb2..00000000 --- a/Patches/LineageOS-16.0/android_frameworks_base/337992-Backport.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Adrian Roos -Date: Thu, 24 Sep 2020 15:30:46 +0200 -Subject: [PATCH] IMMS: Make IMMS PendingIntents immutable - -Fixes: 154913391 -Test: n/a -Change-Id: I34a95732ef3e7c20d6549b57230c11f0c3db04d6 -Merged-In: I34a95732ef3e7c20d6549b57230c11f0c3db04d6 -(cherry picked from commit d4b625994f7664666ac7b53bf6a7d79a6459b3f1) -(cherry picked from commit 6842f03c9d2f128785df5ce2bd02c61f35226554) -(cherry picked from commit 2b859826165bddb11f17b217d097253c442f6045) -Merged-In: I34a95732ef3e7c20d6549b57230c11f0c3db04d6 ---- - .../java/com/android/server/InputMethodManagerService.java | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/services/core/java/com/android/server/InputMethodManagerService.java b/services/core/java/com/android/server/InputMethodManagerService.java -index 412b314aefbf..e728b0aa92e8 100644 ---- a/services/core/java/com/android/server/InputMethodManagerService.java -+++ b/services/core/java/com/android/server/InputMethodManagerService.java -@@ -1402,7 +1402,8 @@ public class InputMethodManagerService extends IInputMethodManager.Stub - - Intent intent = new Intent(ACTION_SHOW_INPUT_METHOD_PICKER) - .setPackage(mContext.getPackageName()); -- mImeSwitchPendingIntent = PendingIntent.getBroadcast(mContext, 0, intent, 0); -+ mImeSwitchPendingIntent = PendingIntent.getBroadcast(mContext, 0, intent, -+ PendingIntent.FLAG_IMMUTABLE); - - mShowOngoingImeSwitcherForPhones = false; - -@@ -2003,7 +2004,8 @@ public class InputMethodManagerService extends IInputMethodManager.Stub - mCurIntent.putExtra(Intent.EXTRA_CLIENT_LABEL, - com.android.internal.R.string.input_method_binding_label); - mCurIntent.putExtra(Intent.EXTRA_CLIENT_INTENT, PendingIntent.getActivity( -- mContext, 0, new Intent(Settings.ACTION_INPUT_METHOD_SETTINGS), 0)); -+ mContext, 0, new Intent(Settings.ACTION_INPUT_METHOD_SETTINGS), -+ PendingIntent.FLAG_IMMUTABLE)); - if (bindCurrentInputMethodServiceLocked(mCurIntent, this, IME_CONNECTION_BIND_FLAGS)) { - mLastBindTime = SystemClock.uptimeMillis(); - mHaveConnection = true; diff --git a/Scripts/LineageOS-16.0/Functions.sh b/Scripts/LineageOS-16.0/Functions.sh index 8f8611e9..0dcf41ed 100644 --- a/Scripts/LineageOS-16.0/Functions.sh +++ b/Scripts/LineageOS-16.0/Functions.sh @@ -81,6 +81,7 @@ patchWorkspace() { repopick -it P_asb_2022-06; repopick -it P_asb_2022-07; repopick -it P_asb_2022-08; + repopick -it P_asb_2022-09; sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh"; diff --git a/Scripts/LineageOS-16.0/Patch.sh b/Scripts/LineageOS-16.0/Patch.sh index 0d616c7b..0287cb2c 100644 --- a/Scripts/LineageOS-16.0/Patch.sh +++ b/Scripts/LineageOS-16.0/Patch.sh @@ -120,10 +120,10 @@ if [ "$DOS_GRAPHENE_CONSTIFY" = true ]; then applyPatch "$DOS_PATCHES/android_ex fi; if enterAndClear "external/expat"; then -git fetch https://github.com/LineageOS/android_external_expat refs/changes/86/337986/2 && git cherry-pick FETCH_HEAD; #Q_asb_2022-09 -git fetch https://github.com/LineageOS/android_external_expat refs/changes/87/337987/2 && git cherry-pick FETCH_HEAD; -git fetch https://github.com/LineageOS/android_external_expat refs/changes/88/337988/2 && git cherry-pick FETCH_HEAD; -git fetch https://github.com/LineageOS/android_external_expat refs/changes/89/337989/2 && git cherry-pick FETCH_HEAD; +git fetch https://github.com/LineageOS/android_external_expat refs/changes/53/338353/1 && git cherry-pick FETCH_HEAD; #P_asb_2022-09 +git fetch https://github.com/LineageOS/android_external_expat refs/changes/54/338354/1 && git cherry-pick FETCH_HEAD; +git fetch https://github.com/LineageOS/android_external_expat refs/changes/55/338355/1 && git cherry-pick FETCH_HEAD; +git fetch https://github.com/LineageOS/android_external_expat refs/changes/56/338356/1 && git cherry-pick FETCH_HEAD; fi; if [ "$DOS_GRAPHENE_MALLOC" = true ]; then @@ -145,10 +145,6 @@ if [ "$DOS_GRAPHENE_MALLOC" = true ]; then applyPatch "$DOS_PATCHES/android_fram fi; if enterAndClear "frameworks/base"; then -git fetch https://github.com/LineageOS/android_frameworks_base refs/changes/90/337990/2 && git cherry-pick FETCH_HEAD; #Q_asb_2022-09 -git fetch https://github.com/LineageOS/android_frameworks_base refs/changes/91/337991/2 && git cherry-pick FETCH_HEAD; -applyPatch "$DOS_PATCHES/android_frameworks_base/337992-Backport.patch"; #(MSe1969) -git fetch https://github.com/LineageOS/android_frameworks_base refs/changes/93/337993/2 && git cherry-pick FETCH_HEAD; applyPatch "$DOS_PATCHES/android_frameworks_base/0007-Always_Restict_Serial.patch"; #Always restrict access to Build.SERIAL (GrapheneOS) applyPatch "$DOS_PATCHES/android_frameworks_base/0008-Browser_No_Location.patch"; #Don't grant location permission to system browsers (GrapheneOS) applyPatch "$DOS_PATCHES/android_frameworks_base/0009-SystemUI_No_Permission_Review.patch"; #Allow SystemUI to directly manage Bluetooth/WiFi (GrapheneOS) @@ -327,12 +323,9 @@ applyPatch "$DOS_PATCHES/android_packages_services_Telephony/0001-PREREQ_Handle_ applyPatch "$DOS_PATCHES/android_packages_services_Telephony/0002-More_Preferred_Network_Modes.patch"; fi; -if enterAndClear "system/bt"; then -git fetch https://github.com/LineageOS/android_vendor_qcom_opensource_system_bt refs/changes/95/337995/1 && git cherry-pick FETCH_HEAD; #Q_asb_2022-09 -git fetch https://github.com/LineageOS/android_vendor_qcom_opensource_system_bt refs/changes/96/337996/1 && git cherry-pick FETCH_HEAD; -git fetch https://github.com/LineageOS/android_vendor_qcom_opensource_system_bt refs/changes/97/337997/1 && git cherry-pick FETCH_HEAD; +#if enterAndClear "system/bt"; then #applyPatch "$DOS_PATCHES_COMMON/android_system_bt/0001-alloc_size.patch"; #Add alloc_size attributes to the allocator (GrapheneOS) -fi; +#fi; if enterAndClear "system/core"; then if [ "$DOS_HOSTS_BLOCKING" = true ]; then cat "$DOS_HOSTS_FILE" >> rootdir/etc/hosts; fi; #Merge in our HOSTS file diff --git a/Scripts/LineageOS-17.1/Functions.sh b/Scripts/LineageOS-17.1/Functions.sh index 057456de..b156e22a 100644 --- a/Scripts/LineageOS-17.1/Functions.sh +++ b/Scripts/LineageOS-17.1/Functions.sh @@ -81,8 +81,9 @@ patchWorkspace() { gpgVerifyGitTag "$DOS_BUILD_BASE/external/hardened_malloc"; gpgVerifyGitHead "$DOS_BUILD_BASE/external/chromium-webview"; - #source build/envsetup.sh; + source build/envsetup.sh; #repopick -it ten-firewall; + repopick -it Q_tzdb2022a2; sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh"; diff --git a/Scripts/LineageOS-18.1/Functions.sh b/Scripts/LineageOS-18.1/Functions.sh index 818a5bfd..75b2ff71 100644 --- a/Scripts/LineageOS-18.1/Functions.sh +++ b/Scripts/LineageOS-18.1/Functions.sh @@ -122,11 +122,12 @@ patchWorkspace() { gpgVerifyGitTag "$DOS_BUILD_BASE/external/hardened_malloc"; gpgVerifyGitHead "$DOS_BUILD_BASE/external/chromium-webview"; - #source build/envsetup.sh; + source build/envsetup.sh; #repopick -it eleven-firewall; - #repopick -i 314130; #adbconnection: don't spin if adbd isn't running #repopick -i 314453; #TaskViewTouchController: Null check current animation on drag #repopick -i 325011; #lineage: Opt-in to shipping full recovery image by default + #repopick -i 339287; #Settings: Good news, `encryptable=footer` is broken + repopick -it R_tzdb2022a2; sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh"; diff --git a/Scripts/LineageOS-19.1/Functions.sh b/Scripts/LineageOS-19.1/Functions.sh index 2c3db1e8..0221a349 100644 --- a/Scripts/LineageOS-19.1/Functions.sh +++ b/Scripts/LineageOS-19.1/Functions.sh @@ -115,6 +115,7 @@ patchWorkspace() { gpgVerifyGitHead "$DOS_BUILD_BASE/external/chromium-webview"; #source build/envsetup.sh; + #repopick -it S_tzdb2022a2; #needs picks sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";