Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2025-01-25 23:05:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixup + Churn

Browse Source 
Signed-off-by: Tavi <tavi@divested.dev>
This commit is contained in:
Tavi 2024-11-10 19:17:49 -05:00
parent ffb6d40bab
commit ffddff80bf
No known key found for this signature in database
GPG Key ID: E599F62ECBAEAF2E
7 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Patches/LineageOS-14.1/android_external_skia/407794.patch
View File

@ -1,4 +1,4 @@
From 261d6dc3a3fd7b094928a00e8f413539ecda097a Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Brian Osman <brianosman@google.com>
Date: Tue, 27 Aug 2024 14:22:52 -0400
Subject: [PATCH] RESTRICT AUTOMERGE: Avoid potential overflow when allocating
@ -25,7 +25,7 @@ Change-Id: Ia35860371d45120baca63238e77faa5c0eb25d51
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/effects/SkEmbossMaskFilter.cpp b/src/effects/SkEmbossMaskFilter.cpp
index 64afa49447d..f0e97dd1d37 100644
index 64afa49447..f0e97dd1d3 100644
--- a/src/effects/SkEmbossMaskFilter.cpp
+++ b/src/effects/SkEmbossMaskFilter.cpp
@@ -95,11 +95,13 @@ bool SkEmbossMaskFilter::filterMask(SkMask* dst, const SkMask& src,

8
Patches/LineageOS-14.1/android_frameworks_base/407791.patch
View File

@ -1,7 +1,7 @@
From 90cdc60d6b846c5f07556e350c108b937c809fd6 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Dmitry Dementyev <dementyev@google.com>
Date: Tue, 2 Jul 2024 11:02:07 -0700
Subject: [PATCH] [BACKPORT] Remove authenticator data if it was disabled.
Subject: [PATCH] Remove authenticator data if it was disabled.
Test: manual
Bug: 343440463
@ -15,10 +15,10 @@ Change-Id: I36bd6bf101da03c9c30a6d3c0080b801e7898bc6
1 file changed, 10 insertions(+)
diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java
index 126955add01a9..9e8f1708b8520 100644
index ce98ce412aaa..0d20d86da413 100644
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
@@ -633,6 +633,16 @@ private void validateAccountsInternal(
@@ -636,6 +636,16 @@ public class AccountManagerService
META_KEY_FOR_AUTHENTICATOR_UID_FOR_TYPE_PREFIX + type,
uid}
);

16
Patches/LineageOS-14.1/android_frameworks_base/407792.patch
View File

@ -1,4 +1,4 @@
From 4f133c1c3c9b219d070046e575cc3a8074788cef Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Fri, 30 Aug 2024 17:22:59 +0000
Subject: [PATCH] RESTRICT AUTOMERGE Clear app-provided shortcut icons
@ -20,10 +20,10 @@ Change-Id: I03cd38e124f393f950c520f8aa9619c42a755ebb
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/core/java/android/view/KeyboardShortcutInfo.java b/core/java/android/view/KeyboardShortcutInfo.java
index a9f2699a6bb16..b3965fde115b3 100644
index a9f2699a6bb1..b3965fde115b 100644
--- a/core/java/android/view/KeyboardShortcutInfo.java
+++ b/core/java/android/view/KeyboardShortcutInfo.java
@@ -28,7 +28,7 @@
@@ -28,7 +28,7 @@ import static java.lang.Character.MIN_VALUE;
*/
public final class KeyboardShortcutInfo implements Parcelable {
private final CharSequence mLabel;
@ -32,7 +32,7 @@ index a9f2699a6bb16..b3965fde115b3 100644
private final char mBaseCharacter;
private final int mKeycode;
private final int mModifiers;
@@ -114,6 +114,15 @@ public Icon getIcon() {
@@ -114,6 +114,15 @@ public final class KeyboardShortcutInfo implements Parcelable {
return mIcon;
}
@ -48,7 +48,7 @@ index a9f2699a6bb16..b3965fde115b3 100644
/**
* Returns the base keycode that, combined with the modifiers, triggers this shortcut. If the
* base character was set instead, returns {@link KeyEvent#KEYCODE_UNKNOWN}. Valid keycodes are
@@ -164,4 +173,4 @@ public KeyboardShortcutInfo[] newArray(int size) {
@@ -164,4 +173,4 @@ public final class KeyboardShortcutInfo implements Parcelable {
return new KeyboardShortcutInfo[size];
}
};
@ -56,10 +56,10 @@ index a9f2699a6bb16..b3965fde115b3 100644
\ No newline at end of file
+}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java
index 9972d0d52b05d..c3028659cdf1f 100644
index 9972d0d52b05..c3028659cdf1 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java
@@ -362,6 +362,7 @@ private void showKeyboardShortcuts(int deviceId) {
@@ -362,6 +362,7 @@ public final class KeyboardShortcuts {
@Override
public void onKeyboardShortcutsReceived(
final List<KeyboardShortcutGroup> result) {
@ -67,7 +67,7 @@ index 9972d0d52b05d..c3028659cdf1f 100644
result.add(getSystemShortcuts());
final KeyboardShortcutGroup appShortcuts = getDefaultApplicationShortcuts();
if (appShortcuts != null) {
@@ -372,6 +373,14 @@ public void onKeyboardShortcutsReceived(
@@ -372,6 +373,14 @@ public final class KeyboardShortcuts {
}, deviceId);
}

6
Patches/LineageOS-14.1/android_packages_apps_Settings/407793.patch
View File

@ -1,4 +1,4 @@
From 26cf73176cdffde0864cf87b9656afcc1fb8ba13 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Adam Bookatz <bookatz@google.com>
Date: Mon, 22 Jul 2024 17:03:12 -0700
Subject: [PATCH] startActivityForResult with new Intent
@ -19,10 +19,10 @@ Change-Id: Id74e4b7ae261f2916eedaef04a679f83409a4b67
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/com/android/settings/users/AppRestrictionsFragment.java b/src/com/android/settings/users/AppRestrictionsFragment.java
index f72bf9e97bf..9971d103fe2 100644
index feb8b9ef01f..1fb83add7ff 100644
--- a/src/com/android/settings/users/AppRestrictionsFragment.java
+++ b/src/com/android/settings/users/AppRestrictionsFragment.java
@@ -638,7 +638,7 @@ public void onReceive(Context context, Intent intent) {
@@ -648,7 +648,7 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
int requestCode = generateCustomActivityRequestCode(
RestrictionsResultReceiver.this.preference);
AppRestrictionsFragment.this.startActivityForResult(

4
Patches/LineageOS-19.1/android_frameworks_base/0031-Unprivileged_microG_Handling.patch
View File

@ -132,7 +132,7 @@ index ed9b539c05df..83cc7a251ebf 100644
|| newPkg.isForceQueryable()
|| ArrayUtils.contains(mForceQueryableByDevicePackageNames,
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 251d5a04f8ee..e0cd8fbbe31a 100644
index a00b442cfd18..aa6bca2e302e 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -552,6 +552,14 @@ public class PackageManagerService extends IPackageManager.Stub
@ -201,7 +201,7 @@ index 251d5a04f8ee..e0cd8fbbe31a 100644
public final PackageInfo getPackageInfo(String packageName, int flags, int userId) {
return getPackageInfoInternal(packageName, PackageManager.VERSION_CODE_HIGHEST,
flags, Binder.getCallingUid(), userId);
@@ -24564,6 +24605,19 @@ public class PackageManagerService extends IPackageManager.Stub
@@ -24568,6 +24609,19 @@ public class PackageManagerService extends IPackageManager.Stub
return null;
}

4
Patches/LineageOS-19.1/android_packages_modules_Wifi/0001-Random_MAC.patch
View File

@ -89,10 +89,10 @@ index b0212133a..5f40104ce 100644
return config.getRandomizedMacAddress();
}
diff --git a/service/java/com/android/server/wifi/WifiConfigurationUtil.java b/service/java/com/android/server/wifi/WifiConfigurationUtil.java
index 3ab3ca3d0..883441cda 100644
index 379661ad0..cbdbc0be3 100644
--- a/service/java/com/android/server/wifi/WifiConfigurationUtil.java
+++ b/service/java/com/android/server/wifi/WifiConfigurationUtil.java
@@ -225,7 +225,7 @@ public class WifiConfigurationUtil {
@@ -233,7 +233,7 @@ public class WifiConfigurationUtil {
public static boolean hasMacRandomizationSettingsChanged(WifiConfiguration existingConfig,
WifiConfiguration newConfig) {
if (existingConfig == null) {

2
Scripts/LineageOS-14.1/Patch.sh
View File

@ -177,7 +177,7 @@ applyPatch "$DOS_PATCHES/android_external_libxml2/367634.patch"; #n-asb-2023-10
fi;
if enterAndClear "external/skia"; then
applyPatch "$DOS_PATCHES/android_external_skia/351107.patch"; #n-asb-2024-11 Avoid potential overflow when allocating 3D mask from emboss filter
applyPatch "$DOS_PATCHES/android_external_skia/407794.patch"; #n-asb-2024-11 Avoid potential overflow when allocating 3D mask from emboss filter
fi;
if enterAndClear "external/sonivox"; then