From baeec11627d505320724096dc987e5661e11484f Mon Sep 17 00:00:00 2001 From: Tad Date: Sun, 16 Apr 2023 01:24:20 -0400 Subject: [PATCH] Picks + Churn Signed-off-by: Tad --- .../android_frameworks_base/0004-Fingerprint_Lockout.patch | 2 +- .../android_frameworks_base/0007-Always_Restict_Serial.patch | 2 +- .../android_frameworks_opt_net_wifi/0001-Random_MAC.patch | 2 +- Scripts/LineageOS-18.1/Functions.sh | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Patches/LineageOS-18.1/android_frameworks_base/0004-Fingerprint_Lockout.patch b/Patches/LineageOS-18.1/android_frameworks_base/0004-Fingerprint_Lockout.patch index 829c8a88..0590e8b3 100644 --- a/Patches/LineageOS-18.1/android_frameworks_base/0004-Fingerprint_Lockout.patch +++ b/Patches/LineageOS-18.1/android_frameworks_base/0004-Fingerprint_Lockout.patch @@ -8,7 +8,7 @@ Subject: [PATCH] use permanent fingerprint lockout immediately 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/biometrics/fingerprint/FingerprintService.java b/services/core/java/com/android/server/biometrics/fingerprint/FingerprintService.java -index 5b51aa6e72ac..79451e535e45 100644 +index 5b51aa6e72ac..652a2e3ec027 100644 --- a/services/core/java/com/android/server/biometrics/fingerprint/FingerprintService.java +++ b/services/core/java/com/android/server/biometrics/fingerprint/FingerprintService.java @@ -108,7 +108,7 @@ public class FingerprintService extends BiometricServiceBase { diff --git a/Patches/LineageOS-18.1/android_frameworks_base/0007-Always_Restict_Serial.patch b/Patches/LineageOS-18.1/android_frameworks_base/0007-Always_Restict_Serial.patch index 78426ee5..77f60531 100644 --- a/Patches/LineageOS-18.1/android_frameworks_base/0007-Always_Restict_Serial.patch +++ b/Patches/LineageOS-18.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 c4ed0bb24fdb..ad5210e64d8b 100644 +index b3d3b4da94b1..5e755feed7b2 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -5239,12 +5239,7 @@ public class ActivityManagerService extends IActivityManager.Stub diff --git a/Patches/LineageOS-18.1/android_frameworks_opt_net_wifi/0001-Random_MAC.patch b/Patches/LineageOS-18.1/android_frameworks_opt_net_wifi/0001-Random_MAC.patch index 1f09f80c..2aaa9269 100644 --- a/Patches/LineageOS-18.1/android_frameworks_opt_net_wifi/0001-Random_MAC.patch +++ b/Patches/LineageOS-18.1/android_frameworks_opt_net_wifi/0001-Random_MAC.patch @@ -116,7 +116,7 @@ index 14866c87e..8db407fa3 100644 if (mVerboseLoggingEnabled) { final String key = config.getKey(); diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java -index 8fc91cb09..25304cca4 100644 +index f40d65624..7276bfb44 100644 --- a/service/java/com/android/server/wifi/WifiConfigManager.java +++ b/service/java/com/android/server/wifi/WifiConfigManager.java @@ -425,9 +425,14 @@ public class WifiConfigManager { diff --git a/Scripts/LineageOS-18.1/Functions.sh b/Scripts/LineageOS-18.1/Functions.sh index d1aebc7c..689f26e1 100644 --- a/Scripts/LineageOS-18.1/Functions.sh +++ b/Scripts/LineageOS-18.1/Functions.sh @@ -113,10 +113,11 @@ patchWorkspaceReal() { verifyAllPlatformTags; gpgVerifyGitHead "$DOS_BUILD_BASE/external/chromium-webview"; - #source build/envsetup.sh; + source build/envsetup.sh; #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_2023-04; sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";