Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2025-03-04 04:09:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

Churn

Browse Source 
Signed-off-by: Tavi <tavi@divested.dev>
This commit is contained in:
Tavi 2024-11-13 08:02:54 -05:00
parent 8b43c0a51a
commit 7ecc843451
No known key found for this signature in database
GPG Key ID: E599F62ECBAEAF2E
15 changed files with 57 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -135,7 +135,7 @@ external/cblas d82c5f4ae14b2a5468303985070f7dadc15d4094
external/cbor-java f81e576298790c97498311e99a0b0b34653c3dd8 external/cbor-java f81e576298790c97498311e99a0b0b34653c3dd8
external/chromium-libpac 169c93e00a00605346a68d39d3f4713735bdb61e external/chromium-libpac 169c93e00a00605346a68d39d3f4713735bdb61e
external/chromium-trace e524766cad26d677a9a1ec8c00c512d4cac2cf5e external/chromium-trace e524766cad26d677a9a1ec8c00c512d4cac2cf5e
external/chromium-webview 298fa43ef0f2a4df8f47a49c20de397ae40d6656 external/chromium-webview a4b0b914b80044a684113e680107138e5bce590a
external/clang 0a1c53a5d295109bd4702ad13c0f2a5510ca1b26 external/clang 0a1c53a5d295109bd4702ad13c0f2a5510ca1b26
external/cldr 38850463abd624d5b2293be75fddc43cf6b55ae2 external/cldr 38850463abd624d5b2293be75fddc43cf6b55ae2
external/cn-cbor 696530332036f5518681d3c450cdbc3ee412004a external/cn-cbor 696530332036f5518681d3c450cdbc3ee412004a

4
Patches/LineageOS-18.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 2dcce2b910..8ea8c08039 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-18.1/android_frameworks_base/0024-Unprivileged_microG_Handling.patch
View File

@ -133,7 +133,7 @@ index 10f77144e022..eaa6bbb58679 100644
|| newPkg.isForceQueryable() || newPkg.isForceQueryable()
|| ArrayUtils.contains(mForceQueryableByDevicePackageNames, || 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 diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index a218bd7fe369..dc4f9f4d8298 100644 index af313ce81db3..8b41740ddaf7 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
@@ -4465,8 +4465,20 @@ public class PackageManagerService extends IPackageManager.Stub @@ -4465,8 +4465,20 @@ public class PackageManagerService extends IPackageManager.Stub
@ -194,7 +194,7 @@ index a218bd7fe369..dc4f9f4d8298 100644
@Override @Override
public PackageInfo getPackageInfo(String packageName, int flags, int userId) { public PackageInfo getPackageInfo(String packageName, int flags, int userId) {
return getPackageInfoInternal(packageName, PackageManager.VERSION_CODE_HIGHEST, return getPackageInfoInternal(packageName, PackageManager.VERSION_CODE_HIGHEST,
@@ -21568,6 +21608,19 @@ public class PackageManagerService extends IPackageManager.Stub @@ -21572,6 +21612,19 @@ public class PackageManagerService extends IPackageManager.Stub
return null; return null;
} }

6
Patches/LineageOS-18.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 fb79904a5b3a..5718071c2bc4 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-18.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 918a9d8943dd..1e1142387d14 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 @@ -833,9 +833,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 d3c10574ea13..f58016acd290 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, @@ -1781,7 +1781,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(), @@ -1816,7 +1816,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) { @@ -1834,10 +1834,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-18.1/android_frameworks_base/408445.patch
View File

@ -1,4 +1,4 @@
From 12f53fb98530441d6612b06f07db77db9de2eaf9 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Ashish Kumar Gupta <kumarashishg@google.com> From: Ashish Kumar Gupta <kumarashishg@google.com>
Date: Wed, 31 Jul 2024 16:02:29 +0000 Date: Wed, 31 Jul 2024 16:02:29 +0000
Subject: [PATCH] Set no data transfer on function switch timeout for accessory Subject: [PATCH] Set no data transfer on function switch timeout for accessory
@ -23,10 +23,10 @@ Change-Id: I698e9df0333cbb51dd9bd5917a94d81273a2784a
1 file changed, 8 insertions(+), 3 deletions(-) 1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java
index a7a51a151b973..8a6731e2e5ee6 100644 index a7a51a151b97..8a6731e2e5ee 100644
--- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java --- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java
+++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java +++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java
@@ -659,7 +659,7 @@ private void updateCurrentAccessory() { @@ -659,7 +659,7 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser
} }
} }
@ -35,7 +35,7 @@ index a7a51a151b973..8a6731e2e5ee6 100644
// make sure accessory mode is off // make sure accessory mode is off
// and restore default functions // and restore default functions
Slog.d(TAG, "exited USB accessory mode"); Slog.d(TAG, "exited USB accessory mode");
@@ -1791,8 +1791,13 @@ public void handleMessage(Message msg) { @@ -1791,8 +1791,13 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser
* Dont force to default when the configuration is already set to default. * Dont force to default when the configuration is already set to default.
*/ */
if (msg.arg1 != 1) { if (msg.arg1 != 1) {

8
Patches/LineageOS-18.1/android_frameworks_base/408446.patch
View File

@ -1,4 +1,4 @@
From 67f7515c79ea18e50bb87f8fbe083493a0aac0d6 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 819a1437a4f1f..c0dd1f1e02f5b 100644 index 819a1437a4f1..c0dd1f1e02f5 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
@@ -13390,6 +13390,9 @@ int installExistingPackageAsUser(@Nullable String packageName, @UserIdInt int us @@ -13390,6 +13390,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 819a1437a4f1f..c0dd1f1e02f5b 100644
// writer // writer
synchronized (mLock) { synchronized (mLock) {
@@ -13397,7 +13400,8 @@ int installExistingPackageAsUser(@Nullable String packageName, @UserIdInt int us @@ -13397,7 +13400,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;
} }

16
Patches/LineageOS-18.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);
} }

8
Patches/LineageOS-18.1/android_frameworks_base/408448.patch
View File

@ -1,4 +1,4 @@
From e1c64096a439b5d54a5cb6de77242217b1516ca1 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Dipankar Bhardwaj <dipankarb@google.com> From: Dipankar Bhardwaj <dipankarb@google.com>
Date: Wed, 21 Aug 2024 14:26:50 +0000 Date: Wed, 21 Aug 2024 14:26:50 +0000
Subject: [PATCH] Restrict access to directories Subject: [PATCH] Restrict access to directories
@ -18,7 +18,7 @@ Change-Id: I8879900e57e1702d11797b81e86d0cc3f55bac22
1 file changed, 68 insertions(+), 11 deletions(-) 1 file changed, 68 insertions(+), 11 deletions(-)
diff --git a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java diff --git a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
index 53e17e35953d1..a722c08605083 100644 index 53e17e35953d..a722c0860508 100644
--- a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java --- a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
+++ b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java +++ b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
@@ -16,8 +16,6 @@ @@ -16,8 +16,6 @@
@ -30,7 +30,7 @@ index 53e17e35953d1..a722c08605083 100644
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.app.usage.StorageStatsManager; import android.app.usage.StorageStatsManager;
@@ -61,12 +59,15 @@ @@ -61,12 +59,15 @@ import java.io.FileDescriptor;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.io.PrintWriter; import java.io.PrintWriter;
@ -63,7 +63,7 @@ index 53e17e35953d1..a722c08605083 100644
private static final String[] DEFAULT_ROOT_PROJECTION = new String[] { private static final String[] DEFAULT_ROOT_PROJECTION = new String[] {
Root.COLUMN_ROOT_ID, Root.COLUMN_FLAGS, Root.COLUMN_ICON, Root.COLUMN_TITLE, Root.COLUMN_ROOT_ID, Root.COLUMN_FLAGS, Root.COLUMN_ICON, Root.COLUMN_TITLE,
@@ -308,10 +306,69 @@ protected boolean shouldHideDocument(@NonNull String documentId) { @@ -308,10 +306,69 @@ public class ExternalStorageProvider extends FileSystemProvider {
return false; return false;
} }

4
Patches/LineageOS-18.1/android_frameworks_opt_net_wifi/0001-Random_MAC.patch
View File

@ -156,10 +156,10 @@ index f40d65624..7276bfb44 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 ffa9facf5..cfd5ce98f 100644 index 6b942735b..e063a2c07 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
@@ -203,7 +203,7 @@ public class WifiConfigurationUtil { @@ -208,7 +208,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) {

13
Patches/LineageOS-18.1/android_frameworks_opt_net_wifi/408452.patch
View File

@ -1,8 +1,7 @@
From 77dbe1a766a8207f7039b9b55643599e2210b0da Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Nate Jiang <qiangjiang@google.com> From: Nate Jiang <qiangjiang@google.com>
Date: Thu, 8 Aug 2024 18:13:39 +0000 Date: Thu, 8 Aug 2024 18:13:39 +0000
Subject: [PATCH] [BACKPORT] Fix security issue by change the field in Subject: [PATCH] Fix security issue by change the field in WifiConfig
WifiConfig
Flag: EXEMPT bugfix Flag: EXEMPT bugfix
Bug: 347912017 Bug: 347912017
@ -18,7 +17,7 @@ Change-Id: I8998340ae557660036895dd906808d682b83c6f0
1 file changed, 71 insertions(+), 1 deletion(-) 1 file changed, 71 insertions(+), 1 deletion(-)
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 ffa9facf55..6b942735b5 100644 index ffa9facf5..6b942735b 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
@@ -63,6 +63,11 @@ public class WifiConfigurationUtil { @@ -63,6 +63,11 @@ public class WifiConfigurationUtil {
@ -33,7 +32,7 @@ index ffa9facf55..6b942735b5 100644
@VisibleForTesting @VisibleForTesting
public static final String PASSWORD_MASK = "*"; public static final String PASSWORD_MASK = "*";
@@ -597,7 +602,8 @@ public static boolean validate(WifiConfiguration config, boolean isAdd) { @@ -597,7 +602,8 @@ public class WifiConfigurationUtil {
if (!validateSsid(config.SSID, isAdd)) { if (!validateSsid(config.SSID, isAdd)) {
return false; return false;
} }
@ -43,7 +42,7 @@ index ffa9facf55..6b942735b5 100644
return false; return false;
} }
if (!validateBitSets(config)) { if (!validateBitSets(config)) {
@@ -606,6 +612,12 @@ public static boolean validate(WifiConfiguration config, boolean isAdd) { @@ -606,6 +612,12 @@ public class WifiConfigurationUtil {
if (!validateKeyMgmt(config.allowedKeyManagement)) { if (!validateKeyMgmt(config.allowedKeyManagement)) {
return false; return false;
} }
@ -56,7 +55,7 @@ index ffa9facf55..6b942735b5 100644
if (config.allowedKeyManagement.get(WifiConfiguration.KeyMgmt.WPA_PSK) if (config.allowedKeyManagement.get(WifiConfiguration.KeyMgmt.WPA_PSK)
&& !validatePassword(config.preSharedKey, isAdd, false, false)) { && !validatePassword(config.preSharedKey, isAdd, false, false)) {
return false; return false;
@@ -651,6 +663,64 @@ public static boolean validate(WifiConfiguration config, boolean isAdd) { @@ -651,6 +663,64 @@ public class WifiConfigurationUtil {
return true; return true;
} }

8
Patches/LineageOS-18.1/android_packages_apps_Settings/408449.patch
View File

@ -1,4 +1,4 @@
From 9411c079df368653f34617e2e07487c00b5da4bc Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Daniel Norman <danielnorman@google.com> From: Daniel Norman <danielnorman@google.com>
Date: Wed, 14 Aug 2024 21:15:42 +0000 Date: Wed, 14 Aug 2024 21:15:42 +0000
Subject: [PATCH] RESTRICT AUTOMERGE Stops hiding a11y services with the same Subject: [PATCH] RESTRICT AUTOMERGE Stops hiding a11y services with the same
@ -19,7 +19,7 @@ diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b
index f918046bc37..b2f37c026ff 100644 index f918046bc37..b2f37c026ff 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettings.java --- a/src/com/android/settings/accessibility/AccessibilitySettings.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettings.java +++ b/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -27,7 +27,6 @@ @@ -27,7 +27,6 @@ import android.content.Context;
import android.content.pm.ActivityInfo; import android.content.pm.ActivityInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo; import android.content.pm.ResolveInfo;
@ -27,7 +27,7 @@ index f918046bc37..b2f37c026ff 100644
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.hardware.display.ColorDisplayManager; import android.hardware.display.ColorDisplayManager;
import android.net.Uri; import android.net.Uri;
@@ -407,17 +406,11 @@ private List<RestrictedPreference> getInstalledAccessibilityList(Context context @@ -407,17 +406,11 @@ public class AccessibilitySettings extends DashboardFragment {
final List<AccessibilityShortcutInfo> installedShortcutList = final List<AccessibilityShortcutInfo> installedShortcutList =
a11yManager.getInstalledAccessibilityShortcutListAsUser(context, a11yManager.getInstalledAccessibilityShortcutListAsUser(context,
UserHandle.myUserId()); UserHandle.myUserId());
@ -45,7 +45,7 @@ index f918046bc37..b2f37c026ff 100644
final List<RestrictedPreference> serviceList = final List<RestrictedPreference> serviceList =
preferenceHelper.createAccessibilityServicePreferenceList(installedServiceList); preferenceHelper.createAccessibilityServicePreferenceList(installedServiceList);
@@ -428,24 +421,6 @@ private List<RestrictedPreference> getInstalledAccessibilityList(Context context @@ -428,24 +421,6 @@ public class AccessibilitySettings extends DashboardFragment {
return preferenceList; return preferenceList;
} }

4
Patches/LineageOS-18.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
@ -22,7 +22,7 @@ diff --git a/src/com/android/settings/users/AppRestrictionsFragment.java b/src/c
index 51624ca63b4..e9e60fb319e 100644 index 51624ca63b4..e9e60fb319e 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) { @@ -655,7 +655,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-18.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;
} }

4
Patches/LineageOS-18.1/android_packages_providers_MediaProvider/408453.patch
View File

@ -1,4 +1,4 @@
From a062609478ba61d2b015ea4eaee550f7c4a31c9f Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Omar Eissa <oeissa@google.com> From: Omar Eissa <oeissa@google.com>
Date: Tue, 27 Aug 2024 13:24:21 +0000 Date: Tue, 27 Aug 2024 13:24:21 +0000
Subject: [PATCH] Prevent apps from renaming files they don't own Subject: [PATCH] Prevent apps from renaming files they don't own
@ -28,7 +28,7 @@ diff --git a/src/com/android/providers/media/MediaProvider.java b/src/com/androi
index a01ba34c6..c15193414 100644 index a01ba34c6..c15193414 100644
--- a/src/com/android/providers/media/MediaProvider.java --- a/src/com/android/providers/media/MediaProvider.java
+++ b/src/com/android/providers/media/MediaProvider.java +++ b/src/com/android/providers/media/MediaProvider.java
@@ -5351,6 +5351,8 @@ && getCallingPackageTargetSdkVersion() <= Build.VERSION_CODES.Q) { @@ -5351,6 +5351,8 @@ public class MediaProvider extends ContentProvider {
case IMAGES_MEDIA_ID: case IMAGES_MEDIA_ID:
case DOWNLOADS_ID: case DOWNLOADS_ID:
case FILES_ID: case FILES_ID: