Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2024-12-14 10:24:32 -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-14 07:47:52 -05:00
parent 12faa352ee
commit ce2a2ee149
No known key found for this signature in database
GPG Key ID: E599F62ECBAEAF2E
21 changed files with 75 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Logs/resetWorkspace-LineageOS-16.0.txt
View File

@ -67,7 +67,7 @@ external/capstone 6788a4139092f179005f7cdbf181ba24b60b6113
external/cblas ddf5f49cb53866fbc503a6349bf44bac24a6963d external/cblas ddf5f49cb53866fbc503a6349bf44bac24a6963d
external/chromium-libpac dff5ddb8d28f6ac9a86eb28763b4313f6f72eec5 external/chromium-libpac dff5ddb8d28f6ac9a86eb28763b4313f6f72eec5
external/chromium-trace b2cf025c7d5cebd43084f38c6c7ff9cc17da428a external/chromium-trace b2cf025c7d5cebd43084f38c6c7ff9cc17da428a
external/chromium-webview 298fa43ef0f2a4df8f47a49c20de397ae40d6656 external/chromium-webview a4b0b914b80044a684113e680107138e5bce590a
external/clang f9d2af42fc6d74c28893af371e4647158eaba66c external/clang f9d2af42fc6d74c28893af371e4647158eaba66c
external/cmockery 9199c7bfafefea32d1884182fa655b6e4578c1c4 external/cmockery 9199c7bfafefea32d1884182fa655b6e4578c1c4
external/cn-cbor 7fe9f01990a97be4df5e46d2decd894c06678072 external/cn-cbor 7fe9f01990a97be4df5e46d2decd894c06678072

2
Logs/resetWorkspace-LineageOS-17.1.txt
View File

@ -78,7 +78,7 @@ external/catch2 bcfbb791d09e390fb545c03ca002e570f764d960
external/cblas 61ee00692011385347a5dd1ad872556899a5cf7a external/cblas 61ee00692011385347a5dd1ad872556899a5cf7a
external/chromium-libpac c98fc96035e6fdc5b84d953d2bd38d2dcd175467 external/chromium-libpac c98fc96035e6fdc5b84d953d2bd38d2dcd175467
external/chromium-trace f4e722b911fcc6f7164026432de62a02ea3460fb external/chromium-trace f4e722b911fcc6f7164026432de62a02ea3460fb
external/chromium-webview 298fa43ef0f2a4df8f47a49c20de397ae40d6656 external/chromium-webview a4b0b914b80044a684113e680107138e5bce590a
external/clang 8343f599c9e1dda8e6c1bb779af323a673a052f9 external/clang 8343f599c9e1dda8e6c1bb779af323a673a052f9
external/cldr 4e0bdd442c1e01f5c6147cf6032ce4f8587f4ede external/cldr 4e0bdd442c1e01f5c6147cf6032ce4f8587f4ede
external/cmockery 9199c7bfafefea32d1884182fa655b6e4578c1c4 external/cmockery 9199c7bfafefea32d1884182fa655b6e4578c1c4

4
Patches/LineageOS-16.0/android_external_skia/408506.patch
View File

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

4
Patches/LineageOS-16.0/android_frameworks_base/0013-Special_Permissions.patch
View File

@ -11,10 +11,10 @@ need to be granted by default for all apps to maintain compatibility.
2 files changed, 25 insertions(+), 8 deletions(-) 2 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 893268da7f36..f91fa76b53ce 100644 index 19245c4f7e0f..e45494de030c 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java --- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -19732,7 +19732,8 @@ public class PackageManagerService extends IPackageManager.Stub @@ -19736,7 +19736,8 @@ public class PackageManagerService extends IPackageManager.Stub
} }
// If this permission was granted by default, make sure it is. // If this permission was granted by default, make sure it is.

6
Patches/LineageOS-16.0/android_frameworks_base/408507.patch
View File

@ -1,4 +1,4 @@
From 49838726eef570a382fdc3da6822f84089efb0d9 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Dmitry Dementyev <dementyev@google.com> From: Dmitry Dementyev <dementyev@google.com>
Date: Tue, 2 Jul 2024 11:02:07 -0700 Date: Tue, 2 Jul 2024 11:02:07 -0700
Subject: [PATCH] Remove authenticator data if it was disabled. Subject: [PATCH] Remove authenticator data if it was disabled.
@ -15,10 +15,10 @@ Change-Id: I36bd6bf101da03c9c30a6d3c0080b801e7898bc6
1 file changed, 4 insertions(+) 1 file changed, 4 insertions(+)
diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java
index c5fff3652c283..5103db36f196e 100644 index c5fff3652c28..5103db36f196 100644
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java --- a/services/core/java/com/android/server/accounts/AccountManagerService.java
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java +++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
@@ -1168,6 +1168,10 @@ private void validateAccountsInternal( @@ -1168,6 +1168,10 @@ public class AccountManagerService
obsoleteAuthType.add(type); obsoleteAuthType.add(type);
// And delete it from the TABLE_META // And delete it from the TABLE_META
accountsDb.deleteMetaByAuthTypeAndUid(type, uid); accountsDb.deleteMetaByAuthTypeAndUid(type, uid);

14
Patches/LineageOS-16.0/android_frameworks_base/408508.patch
View File

@ -1,4 +1,4 @@
From ed3e90e0c1ff4f2a2b0e893ac354ef92503210f4 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jean-Michel Trivi <jmtrivi@google.com> From: Jean-Michel Trivi <jmtrivi@google.com>
Date: Mon, 24 Jun 2024 17:29:14 -0700 Date: Mon, 24 Jun 2024 17:29:14 -0700
Subject: [PATCH] RingtoneManager: allow video ringtone URI Subject: [PATCH] RingtoneManager: allow video ringtone URI
@ -17,10 +17,10 @@ Change-Id: Iac9f27f14bae29e0fabc31e05da2357f6f4f16c7
2 files changed, 13 insertions(+), 6 deletions(-) 2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/media/java/android/media/RingtoneManager.java b/media/java/android/media/RingtoneManager.java diff --git a/media/java/android/media/RingtoneManager.java b/media/java/android/media/RingtoneManager.java
index 0e03bfb2502a4..7a27b03fd731d 100644 index 0e03bfb2502a..7a27b03fd731 100644
--- a/media/java/android/media/RingtoneManager.java --- a/media/java/android/media/RingtoneManager.java
+++ b/media/java/android/media/RingtoneManager.java +++ b/media/java/android/media/RingtoneManager.java
@@ -851,9 +851,13 @@ public static void setActualDefaultRingtoneUri(Context context, int type, Uri ri @@ -851,9 +851,13 @@ public class RingtoneManager {
+ " ignored: failure to find mimeType (no access from this context?)"); + " ignored: failure to find mimeType (no access from this context?)");
return; return;
} }
@ -37,10 +37,10 @@ index 0e03bfb2502a4..7a27b03fd731d 100644
} }
} }
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
index b65b612ecad5c..1cef725241222 100644 index b65b612ecad5..1cef72524122 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -1497,7 +1497,7 @@ private boolean mutateSystemSetting(String name, String value, int runAsUserId, @@ -1497,7 +1497,7 @@ public class SettingsProvider extends ContentProvider {
cacheName = Settings.System.ALARM_ALERT_CACHE; cacheName = Settings.System.ALARM_ALERT_CACHE;
} }
if (cacheName != null) { if (cacheName != null) {
@ -49,7 +49,7 @@ index b65b612ecad5c..1cef725241222 100644
return false; return false;
} }
final File cacheFile = new File( final File cacheFile = new File(
@@ -1532,7 +1532,7 @@ owningUserId, name, value, null, false, getCallingPackage(), @@ -1532,7 +1532,7 @@ public class SettingsProvider extends ContentProvider {
} }
} }
@ -58,7 +58,7 @@ index b65b612ecad5c..1cef725241222 100644
if (uri != null) { if (uri != null) {
Uri audioUri = Uri.parse(uri); Uri audioUri = Uri.parse(uri);
if (Settings.AUTHORITY.equals( if (Settings.AUTHORITY.equals(
@@ -1550,10 +1550,13 @@ private boolean isValidAudioUri(String name, String uri) { @@ -1550,10 +1550,13 @@ public class SettingsProvider extends ContentProvider {
return false; return false;
} }
if (!(mimeType.startsWith("audio/") || mimeType.equals("application/ogg") if (!(mimeType.startsWith("audio/") || mimeType.equals("application/ogg")

8
Patches/LineageOS-16.0/android_frameworks_base/408509.patch
View File

@ -1,4 +1,4 @@
From ddc8e8afabfd0956ddd646f57e7b10670a9309a8 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: lpeter <lpeter@google.com> From: lpeter <lpeter@google.com>
Date: Tue, 6 Aug 2024 09:22:12 +0000 Date: Tue, 6 Aug 2024 09:22:12 +0000
Subject: [PATCH] Disallow device admin package and protected packages to be Subject: [PATCH] Disallow device admin package and protected packages to be
@ -21,10 +21,10 @@ Change-Id: I4e913a12477fd4a64990033eaae533e30863e2a2
1 file changed, 5 insertions(+), 1 deletion(-) 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 893268da7f361..19245c4f7e0f9 100644 index 893268da7f36..19245c4f7e0f 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java --- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -14284,6 +14284,9 @@ public int installExistingPackageAsUser(String packageName, int userId, int inst @@ -14284,6 +14284,9 @@ public class PackageManagerService extends IPackageManager.Stub
(installFlags & PackageManager.INSTALL_INSTANT_APP) != 0; (installFlags & PackageManager.INSTALL_INSTANT_APP) != 0;
final boolean fullApp = final boolean fullApp =
(installFlags & PackageManager.INSTALL_FULL_APP) != 0; (installFlags & PackageManager.INSTALL_FULL_APP) != 0;
@ -34,7 +34,7 @@ index 893268da7f361..19245c4f7e0f9 100644
// writer // writer
synchronized (mPackages) { synchronized (mPackages) {
@@ -14291,7 +14294,8 @@ public int installExistingPackageAsUser(String packageName, int userId, int inst @@ -14291,7 +14294,8 @@ public class PackageManagerService extends IPackageManager.Stub
if (pkgSetting == null) { if (pkgSetting == null) {
return PackageManager.INSTALL_FAILED_INVALID_URI; return PackageManager.INSTALL_FAILED_INVALID_URI;
} }

18
Patches/LineageOS-16.0/android_frameworks_base/408510.patch
View File

@ -1,7 +1,7 @@
From 8dde42c39537e40cbf642350801b4aaf6ba7a73d Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com> From: Ben Murdoch <benm@google.com>
Date: Fri, 30 Aug 2024 17:22:59 +0000 Date: Fri, 30 Aug 2024 17:22:59 +0000
Subject: [PATCH] [BACKPORT] Clear app-provided shortcut icons Subject: [PATCH] Clear app-provided shortcut icons
When displaying keyboard shortcuts provided by an app, clear When displaying keyboard shortcuts provided by an app, clear
any icon that may have been set (this is only possible via any icon that may have been set (this is only possible via
@ -18,10 +18,10 @@ Change-Id: If7e291eb2254c3cbec23673c65e7477e6ad45b09
2 files changed, 20 insertions(+), 2 deletions(-) 2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/core/java/android/view/KeyboardShortcutInfo.java b/core/java/android/view/KeyboardShortcutInfo.java diff --git a/core/java/android/view/KeyboardShortcutInfo.java b/core/java/android/view/KeyboardShortcutInfo.java
index c934a4e31f985..136c19f3f11e3 100644 index c934a4e31f98..136c19f3f11e 100644
--- a/core/java/android/view/KeyboardShortcutInfo.java --- a/core/java/android/view/KeyboardShortcutInfo.java
+++ b/core/java/android/view/KeyboardShortcutInfo.java +++ b/core/java/android/view/KeyboardShortcutInfo.java
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@ import android.os.Parcelable;
*/ */
public final class KeyboardShortcutInfo implements Parcelable { public final class KeyboardShortcutInfo implements Parcelable {
private final CharSequence mLabel; private final CharSequence mLabel;
@ -30,7 +30,7 @@ index c934a4e31f985..136c19f3f11e3 100644
private final char mBaseCharacter; private final char mBaseCharacter;
private final int mKeycode; private final int mKeycode;
private final int mModifiers; private final int mModifiers;
@@ -115,6 +115,15 @@ public Icon getIcon() { @@ -115,6 +115,15 @@ public final class KeyboardShortcutInfo implements Parcelable {
return mIcon; return mIcon;
} }
@ -46,7 +46,7 @@ index c934a4e31f985..136c19f3f11e3 100644
/** /**
* Returns the base keycode that, combined with the modifiers, triggers this shortcut. If the * 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 * base character was set instead, returns {@link KeyEvent#KEYCODE_UNKNOWN}. Valid keycodes are
@@ -165,4 +174,4 @@ public KeyboardShortcutInfo[] newArray(int size) { @@ -165,4 +174,4 @@ public final class KeyboardShortcutInfo implements Parcelable {
return new KeyboardShortcutInfo[size]; return new KeyboardShortcutInfo[size];
} }
}; };
@ -54,10 +54,10 @@ index c934a4e31f985..136c19f3f11e3 100644
\ No newline at end of file \ 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 diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java
index 2d16d2209c9e5..5779aec216838 100644 index 2d16d2209c9e..5779aec21683 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java --- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java
@@ -376,6 +376,7 @@ private void showKeyboardShortcuts(int deviceId) { @@ -376,6 +376,7 @@ public final class KeyboardShortcuts {
@Override @Override
public void onKeyboardShortcutsReceived( public void onKeyboardShortcutsReceived(
final List<KeyboardShortcutGroup> result) { final List<KeyboardShortcutGroup> result) {
@ -65,7 +65,7 @@ index 2d16d2209c9e5..5779aec216838 100644
result.add(getSystemShortcuts()); result.add(getSystemShortcuts());
final KeyboardShortcutGroup appShortcuts = getDefaultApplicationShortcuts(); final KeyboardShortcutGroup appShortcuts = getDefaultApplicationShortcuts();
if (appShortcuts != null) { if (appShortcuts != null) {
@@ -386,6 +387,14 @@ public void onKeyboardShortcutsReceived( @@ -386,6 +387,14 @@ public final class KeyboardShortcuts {
}, deviceId); }, deviceId);
} }

4
Patches/LineageOS-16.0/android_packages_apps_Settings/408511.patch
View File

@ -1,4 +1,4 @@
From 09df73fbe58059be8428b1325c0444a25cd3748b Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Adam Bookatz <bookatz@google.com> From: Adam Bookatz <bookatz@google.com>
Date: Mon, 22 Jul 2024 17:03:12 -0700 Date: Mon, 22 Jul 2024 17:03:12 -0700
Subject: [PATCH] startActivityForResult with new Intent Subject: [PATCH] startActivityForResult with new Intent
@ -22,7 +22,7 @@ diff --git a/src/com/android/settings/users/AppRestrictionsFragment.java b/src/c
index bf0f3da8d00..201d23ceab3 100644 index bf0f3da8d00..201d23ceab3 100644
--- a/src/com/android/settings/users/AppRestrictionsFragment.java --- a/src/com/android/settings/users/AppRestrictionsFragment.java
+++ b/src/com/android/settings/users/AppRestrictionsFragment.java +++ b/src/com/android/settings/users/AppRestrictionsFragment.java
@@ -648,7 +648,7 @@ public void onReceive(Context context, Intent intent) { @@ -648,7 +648,7 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
int requestCode = generateCustomActivityRequestCode( int requestCode = generateCustomActivityRequestCode(
RestrictionsResultReceiver.this.preference); RestrictionsResultReceiver.this.preference);
AppRestrictionsFragment.this.startActivityForResult( AppRestrictionsFragment.this.startActivityForResult(

13
Patches/LineageOS-16.0/android_packages_apps_Settings/408512.patch
View File

@ -1,8 +1,7 @@
From 371cf5203e1140ba416a248ed626413257bac87d Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Fan Wu <cechkahn@google.com> From: Fan Wu <cechkahn@google.com>
Date: Mon, 22 Jul 2024 16:12:46 +0800 Date: Mon, 22 Jul 2024 16:12:46 +0800
Subject: [PATCH] [BACKPORT] Checks cross user permission before handling Subject: [PATCH] Checks cross user permission before handling intent
intent
Bug: 326057017 Bug: 326057017
@ -21,7 +20,7 @@ diff --git a/src/com/android/settings/applications/AppInfoBase.java b/src/com/an
index f8ed315bfd5..549ecbdd61e 100644 index f8ed315bfd5..549ecbdd61e 100644
--- a/src/com/android/settings/applications/AppInfoBase.java --- a/src/com/android/settings/applications/AppInfoBase.java
+++ b/src/com/android/settings/applications/AppInfoBase.java +++ b/src/com/android/settings/applications/AppInfoBase.java
@@ -18,7 +18,9 @@ @@ -18,7 +18,9 @@ package com.android.settings.applications;
import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
@ -31,7 +30,7 @@ index f8ed315bfd5..549ecbdd61e 100644
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.Dialog; import android.app.Dialog;
import android.app.DialogFragment; import android.app.DialogFragment;
@@ -37,6 +39,7 @@ @@ -37,6 +39,7 @@ import android.os.IBinder;
import android.os.ServiceManager; import android.os.ServiceManager;
import android.os.UserHandle; import android.os.UserHandle;
import android.os.UserManager; import android.os.UserManager;
@ -39,7 +38,7 @@ index f8ed315bfd5..549ecbdd61e 100644
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
@@ -134,8 +137,13 @@ protected String retrieveAppEntry() { @@ -134,8 +137,13 @@ public abstract class AppInfoBase extends SettingsPreferenceFragment
} }
} }
if (intent != null && intent.hasExtra(Intent.EXTRA_USER_HANDLE)) { if (intent != null && intent.hasExtra(Intent.EXTRA_USER_HANDLE)) {
@ -55,7 +54,7 @@ index f8ed315bfd5..549ecbdd61e 100644
} else { } else {
mUserId = UserHandle.myUserId(); mUserId = UserHandle.myUserId();
} }
@@ -158,6 +166,32 @@ protected String retrieveAppEntry() { @@ -158,6 +166,32 @@ public abstract class AppInfoBase extends SettingsPreferenceFragment
return mPackageName; return mPackageName;
} }

4
Patches/LineageOS-17.1/android_external_skia/408442.patch
View File

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

4
Patches/LineageOS-17.1/android_frameworks_base/0014-Special_Permissions.patch
View File

@ -11,10 +11,10 @@ need to be granted by default for all apps to maintain compatibility.
2 files changed, 20 insertions(+), 6 deletions(-) 2 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index d27b5ad0d646..32b022455451 100644 index d304f29ec195..9a4edcc5ea39 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java --- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -20218,7 +20218,8 @@ public class PackageManagerService extends IPackageManager.Stub @@ -20222,7 +20222,8 @@ public class PackageManagerService extends IPackageManager.Stub
} }
// If this permission was granted by default, make sure it is. // If this permission was granted by default, make sure it is.

2
Patches/LineageOS-17.1/android_frameworks_base/0021-Unprivileged_microG_Handling.patch
View File

@ -81,7 +81,7 @@ index a84d23b624bf..1ab293758ee7 100644
<!-- This string array can be overriden to enable test location providers initially. --> <!-- This string array can be overriden to enable test location providers initially. -->
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 32b022455451..568cdcac1d47 100644 index 9a4edcc5ea39..4e06b9a23624 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java --- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -4203,8 +4203,20 @@ public class PackageManagerService extends IPackageManager.Stub @@ -4203,8 +4203,20 @@ public class PackageManagerService extends IPackageManager.Stub

6
Patches/LineageOS-17.1/android_frameworks_base/408443.patch
View File

@ -1,4 +1,4 @@
From 3651d27fdb579b51ea8a9b12fc18ca6e495566da Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Dmitry Dementyev <dementyev@google.com> From: Dmitry Dementyev <dementyev@google.com>
Date: Tue, 2 Jul 2024 11:02:07 -0700 Date: Tue, 2 Jul 2024 11:02:07 -0700
Subject: [PATCH] Remove authenticator data if it was disabled. Subject: [PATCH] Remove authenticator data if it was disabled.
@ -15,10 +15,10 @@ Change-Id: I36bd6bf101da03c9c30a6d3c0080b801e7898bc6
1 file changed, 4 insertions(+) 1 file changed, 4 insertions(+)
diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java
index fb79904a5b3a8..5718071c2bc4e 100644 index e8c8b32884e9..f99e82f74f6e 100644
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java --- a/services/core/java/com/android/server/accounts/AccountManagerService.java
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java +++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
@@ -1165,6 +1165,10 @@ private void validateAccountsInternal( @@ -1165,6 +1165,10 @@ public class AccountManagerService
obsoleteAuthType.add(type); obsoleteAuthType.add(type);
// And delete it from the TABLE_META // And delete it from the TABLE_META
accountsDb.deleteMetaByAuthTypeAndUid(type, uid); accountsDb.deleteMetaByAuthTypeAndUid(type, uid);

14
Patches/LineageOS-17.1/android_frameworks_base/408444.patch
View File

@ -1,4 +1,4 @@
From 3f5562449aad196198d0d36c312e6461920cebce Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jean-Michel Trivi <jmtrivi@google.com> From: Jean-Michel Trivi <jmtrivi@google.com>
Date: Mon, 24 Jun 2024 17:29:14 -0700 Date: Mon, 24 Jun 2024 17:29:14 -0700
Subject: [PATCH] RingtoneManager: allow video ringtone URI Subject: [PATCH] RingtoneManager: allow video ringtone URI
@ -17,10 +17,10 @@ Change-Id: Iac9f27f14bae29e0fabc31e05da2357f6f4f16c7
2 files changed, 13 insertions(+), 6 deletions(-) 2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/media/java/android/media/RingtoneManager.java b/media/java/android/media/RingtoneManager.java diff --git a/media/java/android/media/RingtoneManager.java b/media/java/android/media/RingtoneManager.java
index 918a9d8943dde..1e1142387d149 100644 index ad4751165d30..ea1cddca99d1 100644
--- a/media/java/android/media/RingtoneManager.java --- a/media/java/android/media/RingtoneManager.java
+++ b/media/java/android/media/RingtoneManager.java +++ b/media/java/android/media/RingtoneManager.java
@@ -833,9 +833,13 @@ public static void setActualDefaultRingtoneUri(Context context, int type, Uri ri @@ -824,9 +824,13 @@ public class RingtoneManager {
+ " ignored: failure to find mimeType (no access from this context?)"); + " ignored: failure to find mimeType (no access from this context?)");
return; return;
} }
@ -37,10 +37,10 @@ index 918a9d8943dde..1e1142387d149 100644
} }
} }
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
index d3c10574ea134..f58016acd290f 100644 index 7cb41275984e..02165eb8a213 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -1781,7 +1781,7 @@ private boolean mutateSystemSetting(String name, String value, int runAsUserId, @@ -1734,7 +1734,7 @@ public class SettingsProvider extends ContentProvider {
cacheName = Settings.System.ALARM_ALERT_CACHE; cacheName = Settings.System.ALARM_ALERT_CACHE;
} }
if (cacheName != null) { if (cacheName != null) {
@ -49,7 +49,7 @@ index d3c10574ea134..f58016acd290f 100644
return false; return false;
} }
final File cacheFile = new File( final File cacheFile = new File(
@@ -1816,7 +1816,7 @@ owningUserId, name, value, null, false, getCallingPackage(), @@ -1769,7 +1769,7 @@ public class SettingsProvider extends ContentProvider {
} }
} }
@ -58,7 +58,7 @@ index d3c10574ea134..f58016acd290f 100644
if (uri != null) { if (uri != null) {
Uri audioUri = Uri.parse(uri); Uri audioUri = Uri.parse(uri);
if (Settings.AUTHORITY.equals( if (Settings.AUTHORITY.equals(
@@ -1834,10 +1834,13 @@ private boolean isValidAudioUri(String name, String uri) { @@ -1787,10 +1787,13 @@ public class SettingsProvider extends ContentProvider {
return false; return false;
} }
if (!(mimeType.startsWith("audio/") || mimeType.equals("application/ogg") if (!(mimeType.startsWith("audio/") || mimeType.equals("application/ogg")

16
Patches/LineageOS-17.1/android_frameworks_base/408447.patch
View File

@ -1,4 +1,4 @@
From 527ea3afca9a6ae7d330e5f982f9d22011adab7d Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com> From: Ben Murdoch <benm@google.com>
Date: Fri, 30 Aug 2024 17:22:59 +0000 Date: Fri, 30 Aug 2024 17:22:59 +0000
Subject: [PATCH] RESTRICT AUTOMERGE Clear app-provided shortcut icons Subject: [PATCH] RESTRICT AUTOMERGE Clear app-provided shortcut icons
@ -18,10 +18,10 @@ Change-Id: If7e291eb2254c3cbec23673c65e7477e6ad45b09
2 files changed, 20 insertions(+), 2 deletions(-) 2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/core/java/android/view/KeyboardShortcutInfo.java b/core/java/android/view/KeyboardShortcutInfo.java diff --git a/core/java/android/view/KeyboardShortcutInfo.java b/core/java/android/view/KeyboardShortcutInfo.java
index 2660e74dcb205..2075d77a9871e 100644 index 2660e74dcb20..2075d77a9871 100644
--- a/core/java/android/view/KeyboardShortcutInfo.java --- a/core/java/android/view/KeyboardShortcutInfo.java
+++ b/core/java/android/view/KeyboardShortcutInfo.java +++ b/core/java/android/view/KeyboardShortcutInfo.java
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@ import android.os.Parcelable;
*/ */
public final class KeyboardShortcutInfo implements Parcelable { public final class KeyboardShortcutInfo implements Parcelable {
private final CharSequence mLabel; private final CharSequence mLabel;
@ -30,7 +30,7 @@ index 2660e74dcb205..2075d77a9871e 100644
private final char mBaseCharacter; private final char mBaseCharacter;
private final int mKeycode; private final int mKeycode;
private final int mModifiers; private final int mModifiers;
@@ -115,6 +115,15 @@ public Icon getIcon() { @@ -115,6 +115,15 @@ public final class KeyboardShortcutInfo implements Parcelable {
return mIcon; return mIcon;
} }
@ -46,7 +46,7 @@ index 2660e74dcb205..2075d77a9871e 100644
/** /**
* Returns the base keycode that, combined with the modifiers, triggers this shortcut. If the * 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 * base character was set instead, returns {@link KeyEvent#KEYCODE_UNKNOWN}. Valid keycodes are
@@ -165,4 +174,4 @@ public KeyboardShortcutInfo[] newArray(int size) { @@ -165,4 +174,4 @@ public final class KeyboardShortcutInfo implements Parcelable {
return new KeyboardShortcutInfo[size]; return new KeyboardShortcutInfo[size];
} }
}; };
@ -54,10 +54,10 @@ index 2660e74dcb205..2075d77a9871e 100644
\ No newline at end of file \ 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 diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java
index 7e6ddcfea7620..cc373d3c8b0f1 100644 index 7e6ddcfea762..cc373d3c8b0f 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java --- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java
@@ -378,6 +378,7 @@ private void showKeyboardShortcuts(int deviceId) { @@ -378,6 +378,7 @@ public final class KeyboardShortcuts {
@Override @Override
public void onKeyboardShortcutsReceived( public void onKeyboardShortcutsReceived(
final List<KeyboardShortcutGroup> result) { final List<KeyboardShortcutGroup> result) {
@ -65,7 +65,7 @@ index 7e6ddcfea7620..cc373d3c8b0f1 100644
result.add(getSystemShortcuts()); result.add(getSystemShortcuts());
final KeyboardShortcutGroup appShortcuts = getDefaultApplicationShortcuts(); final KeyboardShortcutGroup appShortcuts = getDefaultApplicationShortcuts();
if (appShortcuts != null) { if (appShortcuts != null) {
@@ -388,6 +389,14 @@ public void onKeyboardShortcutsReceived( @@ -388,6 +389,14 @@ public final class KeyboardShortcuts {
}, deviceId); }, deviceId);
} }

4
Patches/LineageOS-17.1/android_frameworks_opt_net_wifi/0002-Random_MAC.patch
View File

@ -69,10 +69,10 @@ index fce5758e1..817fb2958 100644
} }
diff --git a/service/java/com/android/server/wifi/WifiConfigurationUtil.java b/service/java/com/android/server/wifi/WifiConfigurationUtil.java diff --git a/service/java/com/android/server/wifi/WifiConfigurationUtil.java b/service/java/com/android/server/wifi/WifiConfigurationUtil.java
index b8992a011..f47f42d1b 100644 index 98d2cb31a..3830ee286 100644
--- a/service/java/com/android/server/wifi/WifiConfigurationUtil.java --- a/service/java/com/android/server/wifi/WifiConfigurationUtil.java
+++ b/service/java/com/android/server/wifi/WifiConfigurationUtil.java +++ b/service/java/com/android/server/wifi/WifiConfigurationUtil.java
@@ -242,7 +242,7 @@ public class WifiConfigurationUtil { @@ -247,7 +247,7 @@ public class WifiConfigurationUtil {
public static boolean hasMacRandomizationSettingsChanged(WifiConfiguration existingConfig, public static boolean hasMacRandomizationSettingsChanged(WifiConfiguration existingConfig,
WifiConfiguration newConfig) { WifiConfiguration newConfig) {
if (existingConfig == null) { if (existingConfig == null) {

6
Patches/LineageOS-17.1/android_packages_apps_Settings/408450.patch
View File

@ -1,4 +1,4 @@
From 57ac15dfd212fd91ef2501248ac6fab1ec3f6bc6 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Adam Bookatz <bookatz@google.com> From: Adam Bookatz <bookatz@google.com>
Date: Mon, 22 Jul 2024 17:03:12 -0700 Date: Mon, 22 Jul 2024 17:03:12 -0700
Subject: [PATCH] startActivityForResult with new Intent Subject: [PATCH] startActivityForResult with new Intent
@ -19,10 +19,10 @@ Change-Id: Id74e4b7ae261f2916eedaef04a679f83409a4b67
1 file changed, 1 insertion(+), 1 deletion(-) 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 diff --git a/src/com/android/settings/users/AppRestrictionsFragment.java b/src/com/android/settings/users/AppRestrictionsFragment.java
index 51624ca63b4..e9e60fb319e 100644 index 7cf46b69245..3f06e870a02 100644
--- a/src/com/android/settings/users/AppRestrictionsFragment.java --- a/src/com/android/settings/users/AppRestrictionsFragment.java
+++ b/src/com/android/settings/users/AppRestrictionsFragment.java +++ b/src/com/android/settings/users/AppRestrictionsFragment.java
@@ -655,7 +655,7 @@ public void onReceive(Context context, Intent intent) { @@ -649,7 +649,7 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
int requestCode = generateCustomActivityRequestCode( int requestCode = generateCustomActivityRequestCode(
RestrictionsResultReceiver.this.preference); RestrictionsResultReceiver.this.preference);
AppRestrictionsFragment.this.startActivityForResult( AppRestrictionsFragment.this.startActivityForResult(

13
Patches/LineageOS-17.1/android_packages_apps_Settings/408451.patch
View File

@ -1,8 +1,7 @@
From e02728d51e013033f3cc168e8630d0322ccfd803 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Fan Wu <cechkahn@google.com> From: Fan Wu <cechkahn@google.com>
Date: Mon, 22 Jul 2024 16:12:46 +0800 Date: Mon, 22 Jul 2024 16:12:46 +0800
Subject: [PATCH] [BACKPORT] Checks cross user permission before handling Subject: [PATCH] Checks cross user permission before handling intent
intent
Bug: 326057017 Bug: 326057017
@ -21,7 +20,7 @@ diff --git a/src/com/android/settings/applications/AppInfoBase.java b/src/com/an
index 71043400ff8..ef5297acaec 100644 index 71043400ff8..ef5297acaec 100644
--- a/src/com/android/settings/applications/AppInfoBase.java --- a/src/com/android/settings/applications/AppInfoBase.java
+++ b/src/com/android/settings/applications/AppInfoBase.java +++ b/src/com/android/settings/applications/AppInfoBase.java
@@ -18,7 +18,9 @@ @@ -18,7 +18,9 @@ package com.android.settings.applications;
import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
@ -31,7 +30,7 @@ index 71043400ff8..ef5297acaec 100644
import android.app.Dialog; import android.app.Dialog;
import android.app.admin.DevicePolicyManager; import android.app.admin.DevicePolicyManager;
import android.app.settings.SettingsEnums; import android.app.settings.SettingsEnums;
@@ -38,6 +40,7 @@ @@ -38,6 +40,7 @@ import android.os.UserManager;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
@ -39,7 +38,7 @@ index 71043400ff8..ef5297acaec 100644
import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.DialogFragment; import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
@@ -134,8 +137,13 @@ protected String retrieveAppEntry() { @@ -134,8 +137,13 @@ public abstract class AppInfoBase extends SettingsPreferenceFragment
} }
} }
if (intent != null && intent.hasExtra(Intent.EXTRA_USER_HANDLE)) { if (intent != null && intent.hasExtra(Intent.EXTRA_USER_HANDLE)) {
@ -55,7 +54,7 @@ index 71043400ff8..ef5297acaec 100644
} else { } else {
mUserId = UserHandle.myUserId(); mUserId = UserHandle.myUserId();
} }
@@ -158,6 +166,32 @@ protected String retrieveAppEntry() { @@ -158,6 +166,32 @@ public abstract class AppInfoBase extends SettingsPreferenceFragment
return mPackageName; return mPackageName;
} }

2
Patches/LineageOS-17.1/android_packages_providers_MediaProvider/408453-backport.patch
View File

@ -33,7 +33,7 @@ index 4cd4452d0..6e9845fc6 100644
case IMAGES_MEDIA_ID: case IMAGES_MEDIA_ID:
case DOWNLOADS_ID: case DOWNLOADS_ID:
+ // Check if the caller has the required permissions to do placement + // Check if the caller has the required permissions to do placement
+ enforceCallingPermission(uri, extras, true); + enforceCallingPermission(uri, true);
break; break;
default: default:
throw new IllegalArgumentException("Movement of " + uri throw new IllegalArgumentException("Movement of " + uri

6
Scripts/LineageOS-17.1/Patch.sh
View File

@ -174,7 +174,7 @@ git fetch https://github.com/LineageOS/android_external_pdfium refs/changes/15/3
fi; fi;
if enterAndClear "external/skia"; then if enterAndClear "external/skia"; then
applyPatch "$DOS_PATCHES_COMMON/android_external_skia/408442.patch"; #R_asb_2024-11 Avoid potential overflow when allocating 3D mask from emboss filter applyPatch "$DOS_PATCHES/android_external_skia/408442.patch"; #R_asb_2024-11 Avoid potential overflow when allocating 3D mask from emboss filter
fi; fi;
if enterAndClear "external/sonivox"; then if enterAndClear "external/sonivox"; then
@ -415,7 +415,7 @@ if enterAndClear "frameworks/opt/net/wifi"; then
applyPatch "$DOS_PATCHES/android_frameworks_opt_net_wifi/352562.patch"; #Q_asb_2023-03 Revert "wifi: remove certificates for network factory reset" applyPatch "$DOS_PATCHES/android_frameworks_opt_net_wifi/352562.patch"; #Q_asb_2023-03 Revert "wifi: remove certificates for network factory reset"
applyPatch "$DOS_PATCHES/android_frameworks_opt_net_wifi/355360.patch"; #Q_asb_2023-04 Revert "Revert "wifi: remove certificates for network factory reset"" applyPatch "$DOS_PATCHES/android_frameworks_opt_net_wifi/355360.patch"; #Q_asb_2023-04 Revert "Revert "wifi: remove certificates for network factory reset""
applyPatch "$DOS_PATCHES/android_frameworks_opt_net_wifi/378139.patch"; #Q_asb_2023-07 Limit the number of Passpoint per App applyPatch "$DOS_PATCHES/android_frameworks_opt_net_wifi/378139.patch"; #Q_asb_2023-07 Limit the number of Passpoint per App
applyPatch "$DOS_PATCHES/android_frameworks_opt_net_wifi/408452-backport.patch"; #Q_asb_2024-11 Fix security issue by change the field in WifiConfig applyPatch "$DOS_PATCHES/android_frameworks_opt_net_wifi/408452-backport.patch"; #R_asb_2024-11 Fix security issue by change the field in WifiConfig
applyPatch "$DOS_PATCHES/android_frameworks_opt_net_wifi/0001-constify_JNINativeMethod.patch"; #Constify JNINativeMethod tables (GrapheneOS) applyPatch "$DOS_PATCHES/android_frameworks_opt_net_wifi/0001-constify_JNINativeMethod.patch"; #Constify JNINativeMethod tables (GrapheneOS)
applyPatch "$DOS_PATCHES/android_frameworks_opt_net_wifi/0002-Random_MAC.patch"; #Add support for always generating new random MAC (GrapheneOS) applyPatch "$DOS_PATCHES/android_frameworks_opt_net_wifi/0002-Random_MAC.patch"; #Add support for always generating new random MAC (GrapheneOS)
fi; fi;
@ -612,7 +612,7 @@ applyPatch "$DOS_PATCHES/android_packages_providers_MediaProvider/355362.patch";
applyPatch "$DOS_PATCHES/android_packages_providers_MediaProvider/378137.patch"; #Q_asb_2023-09 Canonicalize file path for insertion by legacy apps applyPatch "$DOS_PATCHES/android_packages_providers_MediaProvider/378137.patch"; #Q_asb_2023-09 Canonicalize file path for insertion by legacy apps
applyPatch "$DOS_PATCHES/android_packages_providers_MediaProvider/378138.patch"; #Q_asb_2023-10 Fix path traversal vulnerabilities in MediaProvider applyPatch "$DOS_PATCHES/android_packages_providers_MediaProvider/378138.patch"; #Q_asb_2023-10 Fix path traversal vulnerabilities in MediaProvider
applyPatch "$DOS_PATCHES/android_packages_providers_MediaProvider/399090.patch"; #Q_asb_2024-07 Prevent insertion in other users storage volumes applyPatch "$DOS_PATCHES/android_packages_providers_MediaProvider/399090.patch"; #Q_asb_2024-07 Prevent insertion in other users storage volumes
applyPatch "$DOS_PATCHES/android_packages_providers_MediaProvider/408453-backport.patch"; #Q_asb_2024-11 applyPatch "$DOS_PATCHES/android_packages_providers_MediaProvider/408453-backport.patch"; #R_asb_2024-11
fi; fi;
if enterAndClear "packages/providers/TelephonyProvider"; then if enterAndClear "packages/providers/TelephonyProvider"; then