From 14f7f1db3203d3ea5a1de632b61b3e3c8e0cf81f Mon Sep 17 00:00:00 2001 From: Tad Date: Sat, 12 Nov 2022 23:21:49 -0500 Subject: [PATCH] Updates + Churn Signed-off-by: Tad --- .../android_frameworks_base/344188.patch | 87 ++++++++++++++++ .../android_frameworks_base/344189.patch | 98 +++++++++++++++++++ .../344187.patch | 37 +++++++ .../0013-Special_Permissions-1.patch | 10 +- .../0013-Special_Permissions-10.patch | 2 +- .../0013-Special_Permissions-2.patch | 2 +- .../0013-Special_Permissions-3.patch | 2 +- .../0001-Random_MAC.patch | 2 +- Scripts/LineageOS-14.1/Patch.sh | 3 + Scripts/LineageOS-16.0/Functions.sh | 1 + Scripts/LineageOS-16.0/Patch.sh | 2 +- Scripts/LineageOS-18.1/Functions.sh | 1 - Scripts/LineageOS-19.1/Functions.sh | 13 ++- Scripts/LineageOS-20.0/Functions.sh | 8 +- Scripts/LineageOS-20.0/Patch.sh | 2 +- 15 files changed, 247 insertions(+), 23 deletions(-) create mode 100644 Patches/LineageOS-14.1/android_frameworks_base/344188.patch create mode 100644 Patches/LineageOS-14.1/android_frameworks_base/344189.patch create mode 100644 Patches/LineageOS-14.1/android_packages_apps_PackageInstaller/344187.patch diff --git a/Patches/LineageOS-14.1/android_frameworks_base/344188.patch b/Patches/LineageOS-14.1/android_frameworks_base/344188.patch new file mode 100644 index 00000000..fae12da4 --- /dev/null +++ b/Patches/LineageOS-14.1/android_frameworks_base/344188.patch @@ -0,0 +1,87 @@ +From 623d9421f9f175283af8c562604af2385e7addb1 Mon Sep 17 00:00:00 2001 +From: Louis Chang +Date: Tue, 2 Aug 2022 03:33:39 +0000 +Subject: [PATCH] [BACKPORT] Do not send new Intent to non-exported activity + when navigateUpTo + +The new Intent was delivered to a non-exported activity while + +Bug: 238605611 +Test: atest StartActivityTests +Change-Id: I854dd825bfd9a2c08851980d480d1f3a177af6cf +Merged-In: I854dd825bfd9a2c08851980d480d1f3a177af6cf +(cherry picked from commit b9a934064598aa655fab4ce75c8eab6165409670) +Merged-In: I854dd825bfd9a2c08851980d480d1f3a177af6cf +--- + .../com/android/server/am/ActivityRecord.java | 4 ++++ + .../com/android/server/am/ActivityStack.java | 20 +++++++++++++++++-- + .../com/android/server/am/ProcessRecord.java | 4 ++++ + 3 files changed, 26 insertions(+), 2 deletions(-) + +diff --git a/services/core/java/com/android/server/am/ActivityRecord.java b/services/core/java/com/android/server/am/ActivityRecord.java +index d6c53076614d..a3ace26df5f7 100755 +--- a/services/core/java/com/android/server/am/ActivityRecord.java ++++ b/services/core/java/com/android/server/am/ActivityRecord.java +@@ -1535,6 +1535,10 @@ int getUid() { + return info.applicationInfo.uid; + } + ++ int getPid() { ++ return app != null ? app.getPid() : 0; ++ } ++ + @Override + public String toString() { + if (stringName != null) { +diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java +index 7376fa869ab9..696079848995 100644 +--- a/services/core/java/com/android/server/am/ActivityStack.java ++++ b/services/core/java/com/android/server/am/ActivityStack.java +@@ -3794,14 +3794,30 @@ final boolean navigateUpToLocked(ActivityRecord srec, Intent destIntent, int res + } + + if (parent != null && foundParentInTask) { ++ final int callingUid = srec.info.applicationInfo.uid; + final int parentLaunchMode = parent.info.launchMode; + final int destIntentFlags = destIntent.getFlags(); + if (parentLaunchMode == ActivityInfo.LAUNCH_SINGLE_INSTANCE || + parentLaunchMode == ActivityInfo.LAUNCH_SINGLE_TASK || + parentLaunchMode == ActivityInfo.LAUNCH_SINGLE_TOP || + (destIntentFlags & Intent.FLAG_ACTIVITY_CLEAR_TOP) != 0) { +- parent.deliverNewIntentLocked(srec.info.applicationInfo.uid, destIntent, +- srec.packageName); ++ boolean abort; ++ try { ++ final int callingPid = srec.app != null ? srec.app.getPid() : 0; ++ abort = !mStackSupervisor.checkStartAnyActivityPermission(destIntent, ++ parent.info, null /* resultWho */, -1 /* requestCode */, callingPid, ++ callingUid, srec.info.packageName, false /* ignoreTargetSecurity */, ++ srec.app, null /* resultRecord */, null /* resultStack */, ++ null /* options */); ++ } catch (SecurityException e) { ++ abort = true; ++ } ++ if (abort) { ++ android.util.EventLog.writeEvent(0x534e4554, "238605611", callingUid, ""); ++ foundParentInTask = false; ++ } else { ++ parent.deliverNewIntentLocked(callingUid, destIntent, srec.packageName); ++ } + } else { + try { + ActivityInfo aInfo = AppGlobals.getPackageManager().getActivityInfo( +diff --git a/services/core/java/com/android/server/am/ProcessRecord.java b/services/core/java/com/android/server/am/ProcessRecord.java +index 7746f1e3508d..d8fe39cf2162 100644 +--- a/services/core/java/com/android/server/am/ProcessRecord.java ++++ b/services/core/java/com/android/server/am/ProcessRecord.java +@@ -465,6 +465,10 @@ public void setPid(int _pid) { + stringName = null; + } + ++ public int getPid() { ++ return pid; ++ } ++ + public void makeActive(IApplicationThread _thread, ProcessStatsService tracker) { + String seempStr = "app_uid=" + uid + + ",app_pid=" + pid + ",oom_adj=" + curAdj diff --git a/Patches/LineageOS-14.1/android_frameworks_base/344189.patch b/Patches/LineageOS-14.1/android_frameworks_base/344189.patch new file mode 100644 index 00000000..c5d9307e --- /dev/null +++ b/Patches/LineageOS-14.1/android_frameworks_base/344189.patch @@ -0,0 +1,98 @@ +From 2d476338e9c714405c9fda55283911e00192534d Mon Sep 17 00:00:00 2001 +From: Aseem Kumar +Date: Mon, 21 Mar 2022 20:35:20 -0700 +Subject: [PATCH] DO NOT MERGE Move accountname and typeName length check from + Account.java to AccountManagerService. + +Bug: 169762606 +Test: atest AccountManagerServiceTest +Change-Id: I80fabf3a64c55837db98ff316e7e5420129c001b +(cherry picked from commit 3f218c9a5e1f7c3213ceb84c15afca0d3041057b) +Merged-In: I80fabf3a64c55837db98ff316e7e5420129c001b +--- + core/java/android/accounts/Account.java | 7 ------- + .../server/accounts/AccountManagerService.java | 12 ++++++++++++ + .../accounts/AccountManagerServiceTest.java | 15 +++++++++++++++ + 3 files changed, 27 insertions(+), 7 deletions(-) + +diff --git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java +index 1546ae14862d..3f90f36fb2a1 100644 +--- a/core/java/android/accounts/Account.java ++++ b/core/java/android/accounts/Account.java +@@ -28,7 +28,6 @@ + import android.util.Log; + import com.android.internal.annotations.GuardedBy; + +-import java.util.Objects; + import java.util.Set; + + /** +@@ -81,12 +80,6 @@ public Account(String name, String type, String accessId) { + if (TextUtils.isEmpty(type)) { + throw new IllegalArgumentException("the type must not be empty: " + type); + } +- if (name.length() > 200) { +- throw new IllegalArgumentException("account name is longer than 200 characters"); +- } +- if (type.length() > 200) { +- throw new IllegalArgumentException("account type is longer than 200 characters"); +- } + this.name = name; + this.type = type; + this.accessId = accessId; +diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java +index 126955add01a..30ddc6763842 100644 +--- a/services/core/java/com/android/server/accounts/AccountManagerService.java ++++ b/services/core/java/com/android/server/accounts/AccountManagerService.java +@@ -1304,6 +1304,14 @@ private boolean addAccountInternal(UserAccounts accounts, Account account, Strin + if (account == null) { + return false; + } ++ if (account.name != null && account.name.length() > 200) { ++ Log.w(TAG, "Account cannot be added - Name longer than 200 chars"); ++ return false; ++ } ++ if (account.type != null && account.type.length() > 200) { ++ Log.w(TAG, "Account cannot be added - Name longer than 200 chars"); ++ return false; ++ } + if (!isLocalUnlockedUser(accounts.userId)) { + Log.w(TAG, "Account " + account + " cannot be added - user " + accounts.userId + + " is locked. callingUid=" + callingUid); +@@ -1500,6 +1508,10 @@ public void renameAccount( + + ", pid " + Binder.getCallingPid()); + } + if (accountToRename == null) throw new IllegalArgumentException("account is null"); ++ if (newName != null && newName.length() > 200) { ++ Log.e(TAG, "renameAccount failed - account name longer than 200"); ++ throw new IllegalArgumentException("account name longer than 200"); ++ } + int userId = UserHandle.getCallingUserId(); + if (!isAccountManagedByCaller(accountToRename.type, callingUid, userId)) { + String msg = String.format( +diff --git a/services/tests/servicestests/src/com/android/server/accounts/AccountManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/accounts/AccountManagerServiceTest.java +index a3d0afab88eb..5467f2264efe 100644 +--- a/services/tests/servicestests/src/com/android/server/accounts/AccountManagerServiceTest.java ++++ b/services/tests/servicestests/src/com/android/server/accounts/AccountManagerServiceTest.java +@@ -132,6 +132,21 @@ public void testCheckAddAccount() throws Exception { + assertEquals(a31, accounts[1]); + } + ++ public void testCheckAddAccountLongName() throws Exception { ++ unlockSystemUser(); ++ String longString = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" ++ + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" ++ + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" ++ + "aaaaa"; ++ Account a11 = new Account(longString, AccountManagerServiceTestFixtures.ACCOUNT_TYPE_1); ++ mAms.addAccountExplicitly(a11, /* password= */ "p11", /* extras= */ null); ++ String[] list = new String[]{AccountManagerServiceTestFixtures.CALLER_PACKAGE}; ++ when(mMockPackageManager.getPackagesForUid(anyInt())).thenReturn(list); ++ Account[] accounts = mAms.getAccountsAsUser(null, ++ UserHandle.getCallingUserId(), mContext.getOpPackageName()); ++ assertEquals(0, accounts.length); ++ } ++ + public void testPasswords() throws Exception { + unlockSystemUser(); + Account a11 = new Account("account1", "type1"); diff --git a/Patches/LineageOS-14.1/android_packages_apps_PackageInstaller/344187.patch b/Patches/LineageOS-14.1/android_packages_apps_PackageInstaller/344187.patch new file mode 100644 index 00000000..12732c57 --- /dev/null +++ b/Patches/LineageOS-14.1/android_packages_apps_PackageInstaller/344187.patch @@ -0,0 +1,37 @@ +From 134b1251174395e75f638d53e5449815dc965e8b Mon Sep 17 00:00:00 2001 +From: Evan Severson +Date: Tue, 30 Nov 2021 18:19:18 -0800 +Subject: [PATCH] [BACKPORT] Hide overlays on ReviewPermissionsAtivity + +Test: atest PermissionReviewTapjackingTest +Bug: 176094367 +Merged-In: I9f263b947853e14d081a73ce907917e9326b6ef7 +Change-Id: I9f263b947853e14d081a73ce907917e9326b6ef7 +(cherry picked from commit 725244f010c9c5ed5b169c2ec00600864fce38ab) +Merged-In: I9f263b947853e14d081a73ce907917e9326b6ef7 +--- + .../permission/ui/ReviewPermissionsActivity.java | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/com/android/packageinstaller/permission/ui/ReviewPermissionsActivity.java b/src/com/android/packageinstaller/permission/ui/ReviewPermissionsActivity.java +index 6bc251aed..829e81856 100644 +--- a/src/com/android/packageinstaller/permission/ui/ReviewPermissionsActivity.java ++++ b/src/com/android/packageinstaller/permission/ui/ReviewPermissionsActivity.java +@@ -39,6 +39,7 @@ + import android.text.style.ForegroundColorSpan; + import android.util.TypedValue; + import android.view.View; ++import android.view.WindowManager; + import android.widget.Button; + import android.widget.ImageView; + import android.widget.TextView; +@@ -57,6 +58,9 @@ public final class ReviewPermissionsActivity extends Activity + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + ++ getWindow().addPrivateFlags( ++ WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS); ++ + PackageInfo packageInfo = getTargetPackageInfo(); + if (packageInfo == null) { + finish(); diff --git a/Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-1.patch b/Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-1.patch index 733ebb80..568fbe14 100644 --- a/Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-1.patch +++ b/Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-1.patch @@ -9,7 +9,7 @@ Ported from 12: b294a2ce1d0d185dbc438ac3c06c90386d5f5949 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java -index d34682df3413..1d974b980f6e 100644 +index 1e13333c1ce0..d6f41f9eda99 100644 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java @@ -1409,7 +1409,8 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt @@ -91,7 +91,7 @@ index d34682df3413..1d974b980f6e 100644 uidState.updatePermissionFlags(permission, PackageManager.FLAG_PERMISSION_REVIEW_REQUIRED | PackageManager.FLAG_PERMISSION_REVOKED_COMPAT, -@@ -2823,7 +2834,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt +@@ -2787,7 +2798,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt boolean restrictionApplied = (origState.getPermissionFlags( bp.getName()) & FLAG_PERMISSION_APPLY_RESTRICTION) != 0; @@ -100,7 +100,7 @@ index d34682df3413..1d974b980f6e 100644 // If hard restricted we don't allow holding it if (permissionPolicyInitialized && hardRestricted) { if (!restrictionExempt) { -@@ -2877,6 +2888,16 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt +@@ -2840,6 +2851,16 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt } } } @@ -117,7 +117,7 @@ index d34682df3413..1d974b980f6e 100644 } else { if (origPermState == null) { // New permission -@@ -2911,7 +2932,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt +@@ -2874,7 +2895,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt if (restrictionApplied) { flags &= ~FLAG_PERMISSION_APPLY_RESTRICTION; // Dropping restriction on a legacy app implies a review @@ -126,7 +126,7 @@ index d34682df3413..1d974b980f6e 100644 flags |= FLAG_PERMISSION_REVIEW_REQUIRED; } wasChanged = true; -@@ -3642,7 +3663,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt +@@ -3605,7 +3626,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt if (shouldGrantPermission) { final int flags = getPermissionFlagsInternal(pkg.getPackageName(), permission, myUid, userId); diff --git a/Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-10.patch b/Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-10.patch index eeb09b2d..db28474e 100644 --- a/Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-10.patch +++ b/Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-10.patch @@ -9,7 +9,7 @@ Subject: [PATCH] srt permissions: don't auto-grant denied ones when 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java -index da832f59671d..2204ad6721c8 100644 +index 70fcfb7702b4..beda67a67d20 100644 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java @@ -1809,7 +1809,9 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt diff --git a/Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-2.patch b/Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-2.patch index b5ed2076..5cae69c8 100644 --- a/Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-2.patch +++ b/Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-2.patch @@ -67,7 +67,7 @@ index c6b60f586047..42922a094cd7 100644 Retrieve window content diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java -index 1d974b980f6e..7c76d55d7ae4 100644 +index d6f41f9eda99..1235eba1d0fb 100644 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java @@ -2483,7 +2483,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt diff --git a/Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-3.patch b/Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-3.patch index ba580a24..ba1ad591 100644 --- a/Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-3.patch +++ b/Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-3.patch @@ -86,7 +86,7 @@ index 42922a094cd7..b153a36f65db 100644 Read calendar events and details diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java -index 7c76d55d7ae4..da832f59671d 100644 +index 1235eba1d0fb..70fcfb7702b4 100644 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java @@ -2483,7 +2483,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt diff --git a/Patches/LineageOS-20.0/android_packages_modules_Wifi/0001-Random_MAC.patch b/Patches/LineageOS-20.0/android_packages_modules_Wifi/0001-Random_MAC.patch index 33de14c0..61a9879f 100644 --- a/Patches/LineageOS-20.0/android_packages_modules_Wifi/0001-Random_MAC.patch +++ b/Patches/LineageOS-20.0/android_packages_modules_Wifi/0001-Random_MAC.patch @@ -63,7 +63,7 @@ index e988679fac..b7f4692198 100644 /** * Set the MAC randomization setting for this network. diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java -index f5729dc0b8..1038c2e04f 100644 +index 2079cb82d0..335688e266 100644 --- a/service/java/com/android/server/wifi/WifiConfigManager.java +++ b/service/java/com/android/server/wifi/WifiConfigManager.java @@ -466,6 +466,9 @@ public class WifiConfigManager { diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh index 0181c4dd..2ae53251 100644 --- a/Scripts/LineageOS-14.1/Patch.sh +++ b/Scripts/LineageOS-14.1/Patch.sh @@ -164,6 +164,8 @@ applyPatch "$DOS_PATCHES/android_frameworks_base/334873.patch"; #n-asb-2022-08 O applyPatch "$DOS_PATCHES/android_frameworks_base/338003.patch"; #n-asb-2022-09 IMMS: Make IMMS PendingIntents immutable applyPatch "$DOS_PATCHES/android_frameworks_base/343956.patch"; #n-asb-2022-11 Switch TelecomManager List getters to ParceledListSlice applyPatch "$DOS_PATCHES/android_frameworks_base/343957.patch"; #n-asb-2022-11 Check permission for VoiceInteraction +applyPatch "$DOS_PATCHES/android_frameworks_base/344188.patch"; #n-asb-2022-11 Do not send new Intent to non-exported activity when navigateUpTo +applyPatch "$DOS_PATCHES/android_frameworks_base/344189.patch"; #n-asb-2022-11 Move accountname and typeName length check from Account.java to AccountManagerService. git revert --no-edit 0326bb5e41219cf502727c3aa44ebf2daa19a5b3; #Re-enable doze on devices without gms applyPatch "$DOS_PATCHES/android_frameworks_base/248599.patch"; #Make SET_TIME_ZONE permission match SET_TIME (AOSP) applyPatch "$DOS_PATCHES/android_frameworks_base/0001-Reduced_Resolution.patch"; #Allow reducing resolution to save power TODO: Add 800x480 (DivestOS) @@ -306,6 +308,7 @@ fi; if enterAndClear "packages/apps/PackageInstaller"; then applyPatch "$DOS_PATCHES/android_packages_apps_PackageInstaller/64d8b44.patch"; #Fix an issue with Permission Review (AOSP/452540) +applyPatch "$DOS_PATCHES/android_packages_apps_PackageInstaller/344187.patch"; #n-asb-2022-11 Hide overlays on ReviewPermissionsAtivity fi; if enterAndClear "packages/apps/Settings"; then diff --git a/Scripts/LineageOS-16.0/Functions.sh b/Scripts/LineageOS-16.0/Functions.sh index 4b45c036..0442cd49 100644 --- a/Scripts/LineageOS-16.0/Functions.sh +++ b/Scripts/LineageOS-16.0/Functions.sh @@ -85,6 +85,7 @@ patchWorkspace() { repopick -it P_asb_2022-09 -e 342116; repopick -it P_asb_2022-10 -e 342119; repopick -it P_tzdata_2022; + repopick -it P_asb_2022-11; 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 cb99f97b..6936b065 100644 --- a/Scripts/LineageOS-16.0/Patch.sh +++ b/Scripts/LineageOS-16.0/Patch.sh @@ -98,7 +98,7 @@ applyPatch "$DOS_PATCHES/android_build/0002-Enable_fwrapv.patch"; #Use -fwrapv a sed -i '74i$(my_res_package): PRIVATE_AAPT_FLAGS += --auto-add-overlay' core/aapt2.mk; #Enable auto-add-overlay for packages, this allows the vendor overlay to easily work across all branches. sed -i 's/PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 17/PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 28/' core/version_defaults.mk; #Set the minimum supported target SDK to Pie (GrapheneOS) awk -i inplace '!/Email/' target/product/core.mk; #Remove Email -sed -i 's/2022-01-05/2022-10-05/' core/version_defaults.mk; #Bump Security String #P_asb_2022-10 #XXX +sed -i 's/2022-01-05/2022-11-05/' core/version_defaults.mk; #Bump Security String #P_asb_2022-11 #XXX fi; if enterAndClear "build/soong"; then diff --git a/Scripts/LineageOS-18.1/Functions.sh b/Scripts/LineageOS-18.1/Functions.sh index c66ad0e7..cd5319fc 100644 --- a/Scripts/LineageOS-18.1/Functions.sh +++ b/Scripts/LineageOS-18.1/Functions.sh @@ -114,7 +114,6 @@ patchWorkspace() { #repopick -it eleven-firewall; #repopick -i 314453; #TaskViewTouchController: Null check current animation on drag #repopick -i 325011; #lineage: Opt-in to shipping full recovery image by default - repopick -it R_asb_2022-11; repopick -it R_tzdb2022f; sh "$DOS_SCRIPTS/Patch.sh"; diff --git a/Scripts/LineageOS-19.1/Functions.sh b/Scripts/LineageOS-19.1/Functions.sh index c7b70c7c..520e2663 100644 --- a/Scripts/LineageOS-19.1/Functions.sh +++ b/Scripts/LineageOS-19.1/Functions.sh @@ -60,11 +60,11 @@ buildAll() { buildDevice taimen avb; #superseded buildDevice walleye avb; #superseded #SD845 - buildDevice aura avb; #superseded? + buildDevice aura avb; #superseded buildDevice beryllium avb; #superseded - buildDevice pro1 avb; #superseded? - buildDevice crosshatch avb; #superseded? - buildDevice blueline avb; #superseded? + buildDevice pro1 avb; #superseded + buildDevice crosshatch avb; #superseded + buildDevice blueline avb; #superseded buildDevice enchilada avb; #superseded buildDevice fajita avb; #superseded buildDevice akari avb; @@ -98,8 +98,8 @@ buildAll() { #buildDevice bramble avb; #superseded #buildDevice redfin avb; #superseded #SD670 - buildDevice bonito avb; #superseded? - buildDevice sargo avb; #superseded? + buildDevice bonito avb; #superseded + buildDevice sargo avb; #superseded } export -f buildAll; @@ -115,7 +115,6 @@ patchWorkspace() { source build/envsetup.sh; #repopick -it twelve-colors; - repopick -it S_asb_2022-11; repopick -it S_tzdb2022f; sh "$DOS_SCRIPTS/Patch.sh"; diff --git a/Scripts/LineageOS-20.0/Functions.sh b/Scripts/LineageOS-20.0/Functions.sh index 0d7ce250..be742741 100644 --- a/Scripts/LineageOS-20.0/Functions.sh +++ b/Scripts/LineageOS-20.0/Functions.sh @@ -64,10 +64,10 @@ buildAll() { #SD750 buildDevice FP4 avb; #SD855 - buildDevice guacamole avb; #FIXME - #buildDevice guacamoleb avb; #FIXME - #buildDevice hotdog avb; #FIXME - #buildDevice hotdogb avb; #FIXME + buildDevice guacamole avb; + buildDevice guacamoleb avb; + buildDevice hotdog avb; + buildDevice hotdogb avb; buildDevice coral avb; buildDevice flame avb; #SD730 diff --git a/Scripts/LineageOS-20.0/Patch.sh b/Scripts/LineageOS-20.0/Patch.sh index 0ea15f25..bc5c7644 100644 --- a/Scripts/LineageOS-20.0/Patch.sh +++ b/Scripts/LineageOS-20.0/Patch.sh @@ -390,7 +390,7 @@ awk -i inplace '!/def_backup_transport/' overlay/common/frameworks/base/packages if [ "$DOS_DEBLOBBER_REMOVE_AUDIOFX" = true ]; then sed -i '20d' config/common_mobile.mk && awk -i inplace '!/AudioFX/' config/*.mk; fi; #Remove AudioFX sed -i 's/LINEAGE_BUILDTYPE := UNOFFICIAL/LINEAGE_BUILDTYPE := dos/' config/*.mk; #Change buildtype echo 'include vendor/divested/divestos.mk' >> config/common.mk; #Include our customizations -cp -f "$DOS_PATCHES_COMMON/apns-conf.xml" prebuilt/common/etc/apns-conf.xml; #Update APN list +#cp -f "$DOS_PATCHES_COMMON/apns-conf.xml" prebuilt/common/etc/apns-conf.xml; #Update APN list awk -i inplace '!/Eleven/' config/common_mobile.mk; #Remove Music Player awk -i inplace '!/enforce-product-packages-exist-internal/' config/common.mk; #Ignore missing packages fi;