Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2024-12-23 14:39:24 -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-08-17 12:35:07 -04:00
parent a892dbaa4a
commit 7251c3f1d1
No known key found for this signature in database
GPG Key ID: E599F62ECBAEAF2E
36 changed files with 170 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Patches/LineageOS-16.0/android_frameworks_av/399771.patch
View File

@ -1,4 +1,4 @@
From 27b0b9e4ea4019f315bdb424a36b3182708de29f Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Rakesh Kumar <rakesh.kumar@ittiam.com>
Date: Thu, 30 May 2024 11:17:48 +0000
Subject: [PATCH] StagefrightRecoder: Disabling B-frame support
@ -21,7 +21,7 @@ Change-Id: I4098655eb9687fb633085333bc140634441566e6
1 file changed, 5 insertions(+)
diff --git a/media/libmediaplayerservice/StagefrightRecorder.cpp b/media/libmediaplayerservice/StagefrightRecorder.cpp
index dfc4a2a5a9f..c81643e534d 100644
index dfc4a2a5a9..c81643e534 100644
--- a/media/libmediaplayerservice/StagefrightRecorder.cpp
+++ b/media/libmediaplayerservice/StagefrightRecorder.cpp
@@ -1759,6 +1759,11 @@ status_t StagefrightRecorder::setupVideoEncoder(

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

@ -1,7 +1,7 @@
From 74747aa8b26ad278923444b7b18ec9e06e5c471d Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martijn Coenen <maco@google.com>
Date: Thu, 29 Feb 2024 12:03:05 +0000
Subject: [PATCH] [BACKPORT] Verify UID of incoming Zygote connections.
Subject: [PATCH] Verify UID of incoming Zygote connections.
Only the system UID should be allowed to connect to the Zygote. While
for generic Zygotes this is also covered by SELinux policy, this is not
@ -33,7 +33,7 @@ Change-Id: I3f85a17107849e2cd3e82d6ef15c90b9e2f26532
1 file changed, 3 insertions(+)
diff --git a/core/java/com/android/internal/os/ZygoteConnection.java b/core/java/com/android/internal/os/ZygoteConnection.java
index f537e3e2897b8..522da894fd0f3 100644
index f537e3e2897b..522da894fd0f 100644
--- a/core/java/com/android/internal/os/ZygoteConnection.java
+++ b/core/java/com/android/internal/os/ZygoteConnection.java
@@ -100,6 +100,9 @@ class ZygoteConnection {

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

@ -1,4 +1,4 @@
From 3ddd68bfd55611e77af5024b7c917f068689f34a Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Yi-an Chen <theianchen@google.com>
Date: Tue, 23 Apr 2024 21:53:02 +0000
Subject: [PATCH] Fix security vulnerability of non-dynamic permission removal
@ -23,10 +23,10 @@ Change-Id: Id573b75cdcfce3a1df5731ffb00c4228c513e686
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
index b902001cd359b..91f24d7295a9b 100644
index b902001cd359..91f24d7295a9 100644
--- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
+++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
@@ -758,7 +758,7 @@ private void removeDynamicPermission(
@@ -758,7 +758,7 @@ public class PermissionManagerService {
if (bp == null) {
return;
}

12
Patches/LineageOS-16.0/android_frameworks_base/399075-backport.patch
View File

@ -15,7 +15,7 @@ Change-Id: I96370cbd4f6a55f894c1a93307e5f82dfd394652
3 files changed, 41 insertions(+), 8 deletions(-)
diff --git a/services/core/java/com/android/server/pm/ShortcutPackage.java b/services/core/java/com/android/server/pm/ShortcutPackage.java
index 92e261a72617..10ca7f8cb6ee 100644
index 320cd382c2fc..808347462df8 100644
--- a/services/core/java/com/android/server/pm/ShortcutPackage.java
+++ b/services/core/java/com/android/server/pm/ShortcutPackage.java
@@ -19,17 +19,20 @@ import android.annotation.NonNull;
@ -93,7 +93,7 @@ index 92e261a72617..10ca7f8cb6ee 100644
pw.println();
diff --git a/services/core/java/com/android/server/pm/ShortcutService.java b/services/core/java/com/android/server/pm/ShortcutService.java
index e30da13d7d16..8d7f9501e34c 100644
index d97f653c8326..83dc8e99423d 100644
--- a/services/core/java/com/android/server/pm/ShortcutService.java
+++ b/services/core/java/com/android/server/pm/ShortcutService.java
@@ -311,7 +311,7 @@ public class ShortcutService extends IShortcutService.Stub {
@ -105,7 +105,7 @@ index e30da13d7d16..8d7f9501e34c 100644
private final IPackageManager mIPackageManager;
private final PackageManagerInternal mPackageManagerInternal;
@@ -2215,10 +2215,11 @@ public class ShortcutService extends IShortcutService.Stub {
@@ -2219,10 +2219,11 @@ public class ShortcutService extends IShortcutService.Stub {
shortcutId, packageName, userId));
}
@ -118,7 +118,7 @@ index e30da13d7d16..8d7f9501e34c 100644
if (ps.findShortcutById(shortcutId) == null) {
Log.w(TAG, String.format("reportShortcutUsed: package %s doesn't have shortcut %s",
@@ -2227,12 +2228,7 @@ public class ShortcutService extends IShortcutService.Stub {
@@ -2231,12 +2232,7 @@ public class ShortcutService extends IShortcutService.Stub {
}
}
@ -133,10 +133,10 @@ index e30da13d7d16..8d7f9501e34c 100644
@Override
diff --git a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java
index fcdadaccd2ac..296265100e09 100644
index 464f563640c1..33c595b44ddf 100644
--- a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java
+++ b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java
@@ -1869,6 +1869,8 @@ public class ShortcutManagerTest2 extends BaseShortcutManagerTest {
@@ -1879,6 +1879,8 @@ public class ShortcutManagerTest2 extends BaseShortcutManagerTest {
public void testReportShortcutUsed() {
mRunningUsers.put(USER_10, true);

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

@ -1,4 +1,4 @@
From a8d8d9bb68570d395ddb20449ee466e2b468840c Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Pinyao Ting <pinyaoting@google.com>
Date: Tue, 20 Jul 2021 00:01:29 +0000
Subject: [PATCH] Prevend user spoofing in isRequestPinItemSupported
@ -19,10 +19,10 @@ Change-Id: Icab7cdf25b870b88ecfde9b99e107bbeda0eb485
1 file changed, 15 insertions(+)
diff --git a/services/core/java/com/android/server/pm/ShortcutService.java b/services/core/java/com/android/server/pm/ShortcutService.java
index c18cdcb891409..f4c8127439181 100644
index 83dc8e99423d..56edf675cc67 100644
--- a/services/core/java/com/android/server/pm/ShortcutService.java
+++ b/services/core/java/com/android/server/pm/ShortcutService.java
@@ -1566,6 +1566,19 @@ void injectEnforceCallingPermission(
@@ -1554,6 +1554,19 @@ public class ShortcutService extends IShortcutService.Stub {
mContext.enforceCallingPermission(permission, message);
}
@ -42,7 +42,7 @@ index c18cdcb891409..f4c8127439181 100644
private void verifyCaller(@NonNull String packageName, @UserIdInt int userId) {
Preconditions.checkStringNotEmpty(packageName, "packageName");
@@ -2303,6 +2316,8 @@ public void reportShortcutUsed(String packageName, String shortcutId, int userId
@@ -2237,6 +2250,8 @@ public class ShortcutService extends IShortcutService.Stub {
@Override
public boolean isRequestPinItemSupported(int callingUserId, int requestType) {

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

@ -1,4 +1,4 @@
From 23b1d07217ab29a1f9a9c4d160b15976e00c867e Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Kiran S <krns@google.com>
Date: Mon, 13 May 2024 05:49:06 +0000
Subject: [PATCH] Restrict USB poups while setup is in progress
@ -14,7 +14,7 @@ Change-Id: I7d54534696fd73f3b94c5b4250142eed9341c5d8
1 file changed, 21 insertions(+)
diff --git a/services/usb/java/com/android/server/usb/UsbProfileGroupSettingsManager.java b/services/usb/java/com/android/server/usb/UsbProfileGroupSettingsManager.java
index 43f189b26dfa7..20a76bafb57bf 100644
index 43f189b26dfa..20a76bafb57b 100644
--- a/services/usb/java/com/android/server/usb/UsbProfileGroupSettingsManager.java
+++ b/services/usb/java/com/android/server/usb/UsbProfileGroupSettingsManager.java
@@ -16,6 +16,8 @@
@ -26,7 +26,7 @@ index 43f189b26dfa7..20a76bafb57bf 100644
import static com.android.internal.app.IntentForwarderActivity.FORWARD_INTENT_TO_MANAGED_PROFILE;
import android.annotation.NonNull;
@@ -41,6 +43,7 @@
@@ -41,6 +43,7 @@ import android.os.AsyncTask;
import android.os.Environment;
import android.os.UserHandle;
import android.os.UserManager;
@ -34,7 +34,7 @@ index 43f189b26dfa7..20a76bafb57bf 100644
import android.service.usb.UsbProfileGroupSettingsManagerProto;
import android.service.usb.UsbSettingsAccessoryPreferenceProto;
import android.service.usb.UsbSettingsDevicePreferenceProto;
@@ -677,10 +680,28 @@ private void resolveActivity(Intent intent, UsbDevice device, boolean showMtpNot
@@ -677,10 +680,28 @@ class UsbProfileGroupSettingsManager {
return;
}

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

@ -1,4 +1,4 @@
From fe760134bfa7c0950b3474a3e5abfa0a3b7e53a7 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Linus Tufvesson <lus@google.com>
Date: Mon, 29 Apr 2024 16:32:15 +0200
Subject: [PATCH] Hide SAW subwindows
@ -17,10 +17,10 @@ Change-Id: If19240f5aec2e048de80d75cbbdc00be47622d7f
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java
index 087bd6a80c73d..74b2ef791ade6 100644
index 087bd6a80c73..74b2ef791ade 100644
--- a/services/core/java/com/android/server/wm/WindowState.java
+++ b/services/core/java/com/android/server/wm/WindowState.java
@@ -2635,8 +2635,9 @@ boolean hideLw(boolean doAnimation, boolean requestAnim) {
@@ -2635,8 +2635,9 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
}
void setForceHideNonSystemOverlayWindowIfNeeded(boolean forceHide) {

6
Patches/LineageOS-16.0/android_system_bt/397596.patch
View File

@ -1,4 +1,4 @@
From 36218242743fb18b9d23d3ad5cc787cbf1967ed2 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Brian Delwiche <delwiche@google.com>
Date: Mon, 22 Apr 2024 21:14:56 +0000
Subject: [PATCH] Fix an authentication bypass bug in SMP
@ -20,7 +20,7 @@ Change-Id: I66b1f9a80060f48a604001829db8ea7c96c7b7f8
2 files changed, 13 insertions(+)
diff --git a/stack/smp/smp_act.cc b/stack/smp/smp_act.cc
index f530218fb0..05e0b91a49 100644
index f530218fb..05e0b91a4 100644
--- a/stack/smp/smp_act.cc
+++ b/stack/smp/smp_act.cc
@@ -281,6 +281,7 @@ void smp_send_pair_rsp(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
@ -50,7 +50,7 @@ index f530218fb0..05e0b91a49 100644
STREAM_TO_ARRAY(p_cb->rrand, p, BT_OCTET16_LEN);
}
diff --git a/stack/smp/smp_int.h b/stack/smp/smp_int.h
index e0e27a4b2a..3ccb4ad6f8 100644
index e0e27a4b2..3ccb4ad6f 100644
--- a/stack/smp/smp_int.h
+++ b/stack/smp/smp_int.h
@@ -240,6 +240,7 @@ typedef union {

4
Patches/LineageOS-16.0/android_system_bt/399772.patch
View File

@ -1,4 +1,4 @@
From fdfd1f7d72871cef5f98eb6df11de7d677db6264 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Brian Delwiche <delwiche@google.com>
Date: Mon, 22 Apr 2024 16:43:29 +0000
Subject: [PATCH] Fix heap-buffer overflow in sdp_utils.cc
@ -24,7 +24,7 @@ Change-Id: Ib536cbeac454efbf6af3d713c05c8e3e077e069b
1 file changed, 22 insertions(+), 2 deletions(-)
diff --git a/stack/sdp/sdp_utils.cc b/stack/sdp/sdp_utils.cc
index c2c6b2763a9..a8ff41cae92 100644
index c2c6b2763..a8ff41cae 100644
--- a/stack/sdp/sdp_utils.cc
+++ b/stack/sdp/sdp_utils.cc
@@ -702,8 +702,28 @@ bool sdpu_compare_uuid_arrays(uint8_t* p_uuid1, uint32_t len1, uint8_t* p_uuid2,

6
Patches/LineageOS-17.1/android_frameworks_av/399741.patch
View File

@ -1,4 +1,4 @@
From c68f62f62fc3ffe077098e45f26ffa2fb3300d6c Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Rakesh Kumar <rakesh.kumar@ittiam.com>
Date: Thu, 30 May 2024 11:17:48 +0000
Subject: [PATCH] StagefrightRecoder: Disabling B-frame support
@ -21,10 +21,10 @@ Change-Id: I4098655eb9687fb633085333bc140634441566e6
1 file changed, 5 insertions(+)
diff --git a/media/libmediaplayerservice/StagefrightRecorder.cpp b/media/libmediaplayerservice/StagefrightRecorder.cpp
index a7344de402b..c66def491b9 100644
index 71c79720fe..e2a183e80c 100644
--- a/media/libmediaplayerservice/StagefrightRecorder.cpp
+++ b/media/libmediaplayerservice/StagefrightRecorder.cpp
@@ -1843,6 +1843,11 @@ status_t StagefrightRecorder::setupVideoEncoder(
@@ -1797,6 +1797,11 @@ status_t StagefrightRecorder::setupVideoEncoder(
if (tsLayers > 1) {
uint32_t bLayers = std::min(2u, tsLayers - 1); // use up-to 2 B-layers

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

@ -1,4 +1,4 @@
From 3ec9c56bd4ac40cf11f00866639b37a955eabc8b Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jing Ji <jji@google.com>
Date: Tue, 25 Oct 2022 22:39:52 -0700
Subject: [PATCH] DO NOT MERGE: ActivityManager#killBackgroundProcesses can
@ -19,10 +19,10 @@ Change-Id: I3a39b5e2b2ff0c314972ddeccb012894de704de8
1 file changed, 16 insertions(+)
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 41b1ddaf887bb..bcb7276b4014e 100644
index 98d7cecd81ca..bcb7276b4014 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -4268,6 +4268,22 @@ void killAllBackgroundProcessesExcept(int minTargetSdk, int maxProcState) {
@@ -4217,6 +4217,22 @@ public class ActivityManagerService extends IActivityManager.Stub
throw new SecurityException(msg);
}

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

@ -1,4 +1,4 @@
From a948eaf29141a1f176a9345fb9ec72502c2a8953 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jing Ji <jji@google.com>
Date: Thu, 19 Oct 2023 14:22:58 -0700
Subject: [PATCH] DO NOT MERGE: Fix ActivityManager#killBackgroundProcesses
@ -20,10 +20,10 @@ Change-Id: I1b1e683b6a92b0fa2a844a99bedcccac8c980e58
1 file changed, 16 deletions(-)
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index bcb7276b4014e..41b1ddaf887bb 100644
index bcb7276b4014..41b1ddaf887b 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -4268,22 +4268,6 @@ void killAllBackgroundProcessesExcept(int minTargetSdk, int maxProcState) {
@@ -4268,22 +4268,6 @@ public class ActivityManagerService extends IActivityManager.Stub
throw new SecurityException(msg);
}

12
Patches/LineageOS-17.1/android_frameworks_base/399074.patch
View File

@ -1,4 +1,4 @@
From 3c2f186cb27ba2bfad1639deabccc82bf4593654 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Valentin Iftime <valiiftime@google.com>
Date: Thu, 1 Feb 2024 13:58:49 +0100
Subject: [PATCH] Verify URI permission for channel sound update from
@ -19,10 +19,10 @@ Change-Id: Ic7d2e96e43565e98d2aa29b8f2ba35c142387ba9
2 files changed, 89 insertions(+)
diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java
index 7b1c0ac27ab30..110cfe190ef51 100755
index 7b1c0ac27ab3..110cfe190ef5 100755
--- a/services/core/java/com/android/server/notification/NotificationManagerService.java
+++ b/services/core/java/com/android/server/notification/NotificationManagerService.java
@@ -4333,6 +4333,10 @@ public void updateNotificationChannelFromPrivilegedListener(INotificationListene
@@ -4333,6 +4333,10 @@ public class NotificationManagerService extends SystemService {
Preconditions.checkNotNull(user);
verifyPrivilegedListener(token, user, false);
@ -33,7 +33,7 @@ index 7b1c0ac27ab30..110cfe190ef51 100755
updateNotificationChannelInt(pkg, getUidForPackageAndUser(pkg, user), channel, true);
}
@@ -4412,6 +4416,24 @@ private void verifyPrivilegedListener(INotificationListener token, UserHandle us
@@ -4412,6 +4416,24 @@ public class NotificationManagerService extends SystemService {
}
}
@ -59,10 +59,10 @@ index 7b1c0ac27ab30..110cfe190ef51 100755
int uid = 0;
long identity = Binder.clearCallingIdentity();
diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java
index 0e8cea43063b9..403772d0f875d 100755
index 0e8cea43063b..403772d0f875 100755
--- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java
+++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java
@@ -2037,6 +2037,73 @@ public void testUpdateNotificationChannelFromPrivilegedListener_badUser() throws
@@ -2037,6 +2037,73 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
eq(NotificationListenerService.NOTIFICATION_CHANNEL_OR_GROUP_UPDATED));
}

22
Patches/LineageOS-17.1/android_frameworks_base/399075.patch
View File

@ -1,4 +1,4 @@
From 2614bceca6ee68a8c0d8d7d6a6267ef740622148 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Pinyao Ting <pinyaoting@google.com>
Date: Thu, 30 Nov 2023 23:12:39 +0000
Subject: [PATCH] Added throttle when reporting shortcut usage
@ -15,10 +15,10 @@ Change-Id: I96370cbd4f6a55f894c1a93307e5f82dfd394652
3 files changed, 41 insertions(+), 8 deletions(-)
diff --git a/services/core/java/com/android/server/pm/ShortcutPackage.java b/services/core/java/com/android/server/pm/ShortcutPackage.java
index c6bc7576147f7..da018ad041799 100644
index c6bc7576147f..da018ad04179 100644
--- a/services/core/java/com/android/server/pm/ShortcutPackage.java
+++ b/services/core/java/com/android/server/pm/ShortcutPackage.java
@@ -19,6 +19,7 @@
@@ -19,6 +19,7 @@ import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.UserIdInt;
import android.app.Person;
@ -26,7 +26,7 @@ index c6bc7576147f7..da018ad041799 100644
import android.content.ComponentName;
import android.content.Intent;
import android.content.IntentFilter;
@@ -28,12 +29,14 @@
@@ -28,12 +29,14 @@ import android.content.pm.ShortcutInfo;
import android.content.pm.ShortcutManager;
import android.content.res.Resources;
import android.os.PersistableBundle;
@ -63,7 +63,7 @@ index c6bc7576147f7..da018ad041799 100644
private ShortcutPackage(ShortcutUser shortcutUser,
int packageUserId, String packageName, ShortcutPackageInfo spi) {
super(shortcutUser, packageUserId, packageName,
@@ -1352,6 +1363,30 @@ public boolean hasNonManifestShortcuts() {
@@ -1352,6 +1363,30 @@ class ShortcutPackage extends ShortcutPackageItem {
return false;
}
@ -95,10 +95,10 @@ index c6bc7576147f7..da018ad041799 100644
pw.println();
diff --git a/services/core/java/com/android/server/pm/ShortcutService.java b/services/core/java/com/android/server/pm/ShortcutService.java
index 2e2883dcb2a52..c18cdcb891409 100644
index 2e2883dcb2a5..c18cdcb89140 100644
--- a/services/core/java/com/android/server/pm/ShortcutService.java
+++ b/services/core/java/com/android/server/pm/ShortcutService.java
@@ -315,7 +315,7 @@ public boolean test(PackageInfo pi) {
@@ -315,7 +315,7 @@ public class ShortcutService extends IShortcutService.Stub {
private CompressFormat mIconPersistFormat;
private int mIconPersistQuality;
@ -107,7 +107,7 @@ index 2e2883dcb2a52..c18cdcb891409 100644
private final IPackageManager mIPackageManager;
private final PackageManagerInternal mPackageManagerInternal;
@@ -2285,10 +2285,11 @@ public void reportShortcutUsed(String packageName, String shortcutId, int userId
@@ -2285,10 +2285,11 @@ public class ShortcutService extends IShortcutService.Stub {
shortcutId, packageName, userId));
}
@ -120,7 +120,7 @@ index 2e2883dcb2a52..c18cdcb891409 100644
if (ps.findShortcutById(shortcutId) == null) {
Log.w(TAG, String.format("reportShortcutUsed: package %s doesn't have shortcut %s",
@@ -2297,12 +2298,7 @@ public void reportShortcutUsed(String packageName, String shortcutId, int userId
@@ -2297,12 +2298,7 @@ public class ShortcutService extends IShortcutService.Stub {
}
}
@ -135,10 +135,10 @@ index 2e2883dcb2a52..c18cdcb891409 100644
@Override
diff --git a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java
index 18970322d854c..27cf3502d489c 100644
index 18970322d854..27cf3502d489 100644
--- a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java
+++ b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java
@@ -1940,6 +1940,8 @@ public void testThrottling_resetByInternalCall() throws Exception {
@@ -1940,6 +1940,8 @@ public class ShortcutManagerTest2 extends BaseShortcutManagerTest {
public void testReportShortcutUsed() {
mRunningUsers.put(USER_10, true);

8
Patches/LineageOS-17.1/android_frameworks_base/399076.patch
View File

@ -1,4 +1,4 @@
From a8d8d9bb68570d395ddb20449ee466e2b468840c Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Pinyao Ting <pinyaoting@google.com>
Date: Tue, 20 Jul 2021 00:01:29 +0000
Subject: [PATCH] Prevend user spoofing in isRequestPinItemSupported
@ -19,10 +19,10 @@ Change-Id: Icab7cdf25b870b88ecfde9b99e107bbeda0eb485
1 file changed, 15 insertions(+)
diff --git a/services/core/java/com/android/server/pm/ShortcutService.java b/services/core/java/com/android/server/pm/ShortcutService.java
index c18cdcb891409..f4c8127439181 100644
index c18cdcb89140..f4c812743918 100644
--- a/services/core/java/com/android/server/pm/ShortcutService.java
+++ b/services/core/java/com/android/server/pm/ShortcutService.java
@@ -1566,6 +1566,19 @@ void injectEnforceCallingPermission(
@@ -1566,6 +1566,19 @@ public class ShortcutService extends IShortcutService.Stub {
mContext.enforceCallingPermission(permission, message);
}
@ -42,7 +42,7 @@ index c18cdcb891409..f4c8127439181 100644
private void verifyCaller(@NonNull String packageName, @UserIdInt int userId) {
Preconditions.checkStringNotEmpty(packageName, "packageName");
@@ -2303,6 +2316,8 @@ public void reportShortcutUsed(String packageName, String shortcutId, int userId
@@ -2303,6 +2316,8 @@ public class ShortcutService extends IShortcutService.Stub {
@Override
public boolean isRequestPinItemSupported(int callingUserId, int requestType) {

26
Patches/LineageOS-17.1/android_frameworks_base/399077.patch
View File

@ -1,4 +1,4 @@
From c2cf66ca1d5a676a8b29049c54c5117f1e2a5c72 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Valentin Iftime <valiiftime@google.com>
Date: Thu, 22 Feb 2024 10:51:58 +0100
Subject: [PATCH] Check for NLS bind permission when rebinding services
@ -19,7 +19,7 @@ Change-Id: I11901755ec430c6e3145def9d67e4e63cda00806
2 files changed, 139 insertions(+), 23 deletions(-)
diff --git a/services/core/java/com/android/server/notification/ManagedServices.java b/services/core/java/com/android/server/notification/ManagedServices.java
index 4828bbfff6762..2d9cfcb3ebb52 100644
index 4828bbfff676..2d9cfcb3ebb5 100644
--- a/services/core/java/com/android/server/notification/ManagedServices.java
+++ b/services/core/java/com/android/server/notification/ManagedServices.java
@@ -141,7 +141,9 @@ abstract public class ManagedServices {
@ -33,7 +33,7 @@ index 4828bbfff6762..2d9cfcb3ebb52 100644
// True if approved services are stored in xml, not settings.
private boolean mUseXml;
@@ -573,6 +575,23 @@ protected boolean isPackageOrComponentAllowed(String pkgOrComponent, int userId)
@@ -573,6 +575,23 @@ abstract public class ManagedServices {
return false;
}
@ -57,7 +57,7 @@ index 4828bbfff6762..2d9cfcb3ebb52 100644
protected boolean isPackageAllowed(String pkg, int userId) {
if (pkg == null) {
return false;
@@ -623,6 +642,7 @@ public void onPackagesChanged(boolean removingPackage, String[] pkgList, int[] u
@@ -623,6 +642,7 @@ abstract public class ManagedServices {
for (int uid : uidList) {
if (isPackageAllowed(pkgName, UserHandle.getUserId(uid))) {
anyServicesInvolved = true;
@ -65,7 +65,7 @@ index 4828bbfff6762..2d9cfcb3ebb52 100644
}
}
}
@@ -749,8 +769,7 @@ protected void setComponentState(ComponentName component, boolean enabled) {
@@ -749,8 +769,7 @@ abstract public class ManagedServices {
for (int i = 0; i < userIds.size(); i++) {
final int userId = userIds.get(i);
if (enabled) {
@ -75,7 +75,7 @@ index 4828bbfff6762..2d9cfcb3ebb52 100644
registerServiceLocked(component, userId);
} else {
Slog.d(TAG, component + " no longer has permission to be bound");
@@ -889,6 +908,33 @@ private boolean removeUninstalledItemsFromApprovedLists(int uninstalledUserId, S
@@ -889,6 +908,33 @@ abstract public class ManagedServices {
return removed;
}
@ -109,7 +109,7 @@ index 4828bbfff6762..2d9cfcb3ebb52 100644
protected String getPackageName(String packageOrComponent) {
final ComponentName component = ComponentName.unflattenFromString(packageOrComponent);
if (component != null) {
@@ -1048,26 +1094,20 @@ private void bindToServices(SparseArray<Set<ComponentName>> componentsToBind) {
@@ -1048,26 +1094,20 @@ abstract public class ManagedServices {
final int userId = componentsToBind.keyAt(i);
final Set<ComponentName> add = componentsToBind.get(userId);
for (ComponentName component : add) {
@ -149,7 +149,7 @@ index 4828bbfff6762..2d9cfcb3ebb52 100644
}
}
}
@@ -1081,6 +1121,15 @@ private void registerService(final ComponentName name, final int userid) {
@@ -1081,6 +1121,15 @@ abstract public class ManagedServices {
}
}
@ -165,7 +165,7 @@ index 4828bbfff6762..2d9cfcb3ebb52 100644
/**
* Inject a system service into the management list.
*/
@@ -1181,7 +1230,7 @@ public void onBindingDied(ComponentName name) {
@@ -1181,7 +1230,7 @@ abstract public class ManagedServices {
mHandler.postDelayed(new Runnable() {
@Override
public void run() {
@ -174,7 +174,7 @@ index 4828bbfff6762..2d9cfcb3ebb52 100644
}
}, ON_BINDING_DIED_REBIND_DELAY_MS);
} else {
@@ -1313,6 +1362,19 @@ private void unbindService(ServiceConnection connection, ComponentName component
@@ -1313,6 +1362,19 @@ abstract public class ManagedServices {
}
}
@ -195,10 +195,10 @@ index 4828bbfff6762..2d9cfcb3ebb52 100644
public IInterface service;
public ComponentName component;
diff --git a/services/tests/uiservicestests/src/com/android/server/notification/ManagedServicesTest.java b/services/tests/uiservicestests/src/com/android/server/notification/ManagedServicesTest.java
index 8aaf29a110332..cac620f409f32 100644
index 8aaf29a11033..cac620f409f3 100644
--- a/services/tests/uiservicestests/src/com/android/server/notification/ManagedServicesTest.java
+++ b/services/tests/uiservicestests/src/com/android/server/notification/ManagedServicesTest.java
@@ -28,8 +28,10 @@
@@ -28,8 +28,10 @@ import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.doAnswer;
@ -209,7 +209,7 @@ index 8aaf29a110332..cac620f409f32 100644
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -624,6 +626,58 @@ public void testUpgradeAppBindsNewServices() throws Exception {
@@ -624,6 +626,58 @@ public class ManagedServicesTest extends UiServiceTestCase {
}
}

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

@ -1,4 +1,4 @@
From 4b0cceb626252107c4e532afee62533e166523e5 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Yi-an Chen <theianchen@google.com>
Date: Tue, 20 Feb 2024 04:34:57 +0000
Subject: [PATCH] Fix error handling for non-dynamic permissions
@ -18,10 +18,10 @@ Change-Id: I7336f2fc78804f26e4b2a329870ecdea776595d8
1 file changed, 1 insertion(+)
diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
index 2fcdec7c92d67..ed551795aad58 100644
index 2fcdec7c92d6..ed551795aad5 100644
--- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
+++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
@@ -1015,6 +1015,7 @@ private void removeDynamicPermission(
@@ -1015,6 +1015,7 @@ public class PermissionManagerService {
// TODO: switch this back to SecurityException
Slog.wtf(TAG, "Not allowed to modify non-dynamic permission "
+ permName);

8
Patches/LineageOS-17.1/android_frameworks_base/399079.patch
View File

@ -1,4 +1,4 @@
From 8e3b69bbd4ae5f918dd783b190e298c74584e45c Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Dmitry Dementyev <dementyev@google.com>
Date: Tue, 26 Mar 2024 10:31:44 -0700
Subject: [PATCH] Add more checkKeyIntent checks to AccountManagerService.
@ -14,10 +14,10 @@ Change-Id: I9e45d758a2320328da5664b6341eafe6f285f297
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 326acdfe3a3f5..bf577735d0372 100644
index 326acdfe3a3f..bf577735d037 100644
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
@@ -3479,6 +3479,11 @@ public void onResult(Bundle result) {
@@ -3479,6 +3479,11 @@ public class AccountManagerService
// Strip auth token from result.
result.remove(AccountManager.KEY_AUTHTOKEN);
@ -29,7 +29,7 @@ index 326acdfe3a3f5..bf577735d0372 100644
if (Log.isLoggable(TAG, Log.VERBOSE)) {
Log.v(TAG,
@@ -5062,6 +5067,11 @@ public void onResult(Bundle result) {
@@ -5062,6 +5067,11 @@ public class AccountManagerService
} else {
if (mStripAuthTokenFromResult) {
result.remove(AccountManager.KEY_AUTHTOKEN);

12
Patches/LineageOS-17.1/android_frameworks_base/399080.patch
View File

@ -1,8 +1,7 @@
From 25baa1489699bb620c2ef8e4d78a265b85132c87 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Haoran Zhang <haoranzhang@google.com>
Date: Wed, 13 Mar 2024 17:08:00 +0000
Subject: [PATCH] [DO NOT MERGE][Autofill Framework] Add in check for intent
filter when setting/updating service
Subject: [PATCH] Add in check for intent filter when setting/updating service
For test, I registered two tests around on ABTD. CtsAutoFillServiceTestCases module is passing except three known failures:
@ -10,7 +9,6 @@ Test run link:
- https://android-build.corp.google.com/builds/abtd/run/L33300030002610600
- https://android-build.corp.google.com/builds/abtd/run/L58100030002616607
Bug: b/324874908
Test: atest CtsAutoFillServiceTestCases
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:141d9d050346bfc4673c429382deb1b3d210f6ad)
@ -22,10 +20,10 @@ Change-Id: I51c2e3788ac29ff4d6b86aa2a735ff2ea1463a77
1 file changed, 27 insertions(+)
diff --git a/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java b/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java
index 1bd5201f5b266..58a1064682d35 100644
index 1bd5201f5b26..58a1064682d3 100644
--- a/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java
+++ b/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java
@@ -32,8 +32,10 @@
@@ -32,8 +32,10 @@ import android.app.ActivityManagerInternal;
import android.app.ActivityTaskManager;
import android.app.IActivityTaskManager;
import android.content.ComponentName;
@ -36,7 +34,7 @@ index 1bd5201f5b266..58a1064682d35 100644
import android.content.pm.ServiceInfo;
import android.graphics.Rect;
import android.metrics.LogMaker;
@@ -214,6 +216,31 @@ protected boolean updateLocked(boolean disabled) {
@@ -214,6 +216,31 @@ final class AutofillManagerServiceImpl
@Override // from PerUserSystemService
protected ServiceInfo newServiceInfoLocked(@NonNull ComponentName serviceComponent)
throws NameNotFoundException {

8
Patches/LineageOS-17.1/android_frameworks_base/399081.patch
View File

@ -1,4 +1,4 @@
From 19820317cc73a78c8141d8e3cbc435bdf1c0f503 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Hans Boehm <hboehm@google.com>
Date: Tue, 2 Jan 2024 16:53:13 -0800
Subject: [PATCH] Check hidden API exemptions
@ -18,10 +18,10 @@ Change-Id: I83cd60e46407a4a082f9f3c80e937dbd522dbac4
1 file changed, 10 insertions(+)
diff --git a/core/java/android/os/ZygoteProcess.java b/core/java/android/os/ZygoteProcess.java
index 0417a4c8959c0..ff4131c2398d8 100644
index 0417a4c8959c..ff4131c2398d 100644
--- a/core/java/android/os/ZygoteProcess.java
+++ b/core/java/android/os/ZygoteProcess.java
@@ -411,6 +411,8 @@ private Process.ProcessStartResult zygoteSendArgsAndGetResult(
@@ -411,6 +411,8 @@ public class ZygoteProcess {
throw new ZygoteStartFailedEx("Embedded newlines not allowed");
} else if (arg.indexOf('\r') >= 0) {
throw new ZygoteStartFailedEx("Embedded carriage returns not allowed");
@ -30,7 +30,7 @@ index 0417a4c8959c0..ff4131c2398d8 100644
}
}
@@ -869,6 +871,14 @@ private boolean maybeSetApiBlacklistExemptions(ZygoteState state, boolean sendIf
@@ -869,6 +871,14 @@ public class ZygoteProcess {
return true;
}

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

@ -1,4 +1,4 @@
From a76b0a0c26bc16a98840757e9c999a10101c565a Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Julia Reynolds <juliacr@google.com>
Date: Mon, 13 Apr 2020 11:03:44 -0400
Subject: [PATCH] Add StatusBarNotification::getNormalizedUserId
@ -13,10 +13,10 @@ Change-Id: Ife602cee53c303dd3f841004d8ffc84b38c7677b
1 file changed, 12 insertions(+)
diff --git a/core/java/android/service/notification/StatusBarNotification.java b/core/java/android/service/notification/StatusBarNotification.java
index 905c7811e4573..39395074b9165 100644
index 905c7811e457..39395074b916 100644
--- a/core/java/android/service/notification/StatusBarNotification.java
+++ b/core/java/android/service/notification/StatusBarNotification.java
@@ -273,6 +273,18 @@ public int getUserId() {
@@ -273,6 +273,18 @@ public class StatusBarNotification implements Parcelable {
return this.user.getIdentifier();
}

24
Patches/LineageOS-17.1/android_frameworks_base/399083.patch
View File

@ -1,4 +1,4 @@
From 74184eec063b205f9131a5a8335c7e2335fcabf8 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Makoto Onuki <omakoto@google.com>
Date: Wed, 9 Oct 2019 15:33:11 -0700
Subject: [PATCH] Add Context.createContextAsUser()
@ -19,7 +19,7 @@ Change-Id: Id640e03862462724df1a4a3101f0b08faafba22f
6 files changed, 44 insertions(+), 3 deletions(-)
diff --git a/api/system-current.txt b/api/system-current.txt
index 07689adc67cc3..02e348309fff1 100644
index 07689adc67cc..02e348309fff 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -1346,8 +1346,9 @@ package android.content {
@ -34,7 +34,7 @@ index 07689adc67cc3..02e348309fff1 100644
method public abstract boolean isCredentialProtectedStorage();
method public abstract void sendBroadcast(android.content.Intent, @Nullable String, @Nullable android.os.Bundle);
diff --git a/api/test-current.txt b/api/test-current.txt
index d3bea18fb9447..5f53b2a40a49e 100644
index d3bea18fb944..5f53b2a40a49 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -638,7 +638,8 @@ package android.content {
@ -48,10 +48,10 @@ index d3bea18fb9447..5f53b2a40a49e 100644
method public abstract int getDisplayId();
method public android.os.UserHandle getUser();
diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java
index 41a4fba0434cd..1f3c3a46792a6 100644
index 41a4fba0434c..1f3c3a46792a 100644
--- a/core/java/android/app/ContextImpl.java
+++ b/core/java/android/app/ContextImpl.java
@@ -2200,6 +2200,15 @@ public Context createPackageContextAsUser(String packageName, int flags, UserHan
@@ -2200,6 +2200,15 @@ class ContextImpl extends Context {
"Application package " + packageName + " not found");
}
@ -68,10 +68,10 @@ index 41a4fba0434cd..1f3c3a46792a6 100644
public Context createContextForSplit(String splitName) throws NameNotFoundException {
if (!mPackageInfo.getApplicationInfo().requestsIsolatedSplitLoading()) {
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index 6fb10c1c277cb..713287d26f80c 100644
index 6fb10c1c277c..713287d26f80 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -5196,8 +5196,9 @@ public abstract Context createPackageContext(String packageName,
@@ -5196,8 +5196,9 @@ public abstract class Context {
*/
@SystemApi
@TestApi
@ -82,7 +82,7 @@ index 6fb10c1c277cb..713287d26f80c 100644
throws PackageManager.NameNotFoundException {
if (Build.IS_ENG) {
throw new IllegalStateException("createPackageContextAsUser not overridden!");
@@ -5205,6 +5206,23 @@ public Context createPackageContextAsUser(
@@ -5205,6 +5206,23 @@ public abstract class Context {
return this;
}
@ -107,10 +107,10 @@ index 6fb10c1c277cb..713287d26f80c 100644
* Creates a context given an {@link android.content.pm.ApplicationInfo}.
*
diff --git a/core/java/android/content/ContextWrapper.java b/core/java/android/content/ContextWrapper.java
index 0859f97e81a10..f7cd51e7ffbca 100644
index 0859f97e81a1..f7cd51e7ffbc 100644
--- a/core/java/android/content/ContextWrapper.java
+++ b/core/java/android/content/ContextWrapper.java
@@ -883,6 +883,12 @@ public Context createPackageContextAsUser(String packageName, int flags, UserHan
@@ -883,6 +883,12 @@ public class ContextWrapper extends Context {
return mBase.createPackageContextAsUser(packageName, flags, user);
}
@ -124,10 +124,10 @@ index 0859f97e81a10..f7cd51e7ffbca 100644
@Override
@UnsupportedAppUsage
diff --git a/test-mock/src/android/test/mock/MockContext.java b/test-mock/src/android/test/mock/MockContext.java
index a95b6f11e98a5..fcd4701c76307 100644
index a95b6f11e98a..fcd4701c7630 100644
--- a/test-mock/src/android/test/mock/MockContext.java
+++ b/test-mock/src/android/test/mock/MockContext.java
@@ -756,6 +756,12 @@ public Context createPackageContextAsUser(String packageName, int flags, UserHan
@@ -756,6 +756,12 @@ public class MockContext extends Context {
throw new UnsupportedOperationException();
}

22
Patches/LineageOS-17.1/android_frameworks_base/399084.patch
View File

@ -1,4 +1,4 @@
From fdc2deb5be6920d00e8c3fbc84fc0f158a0d3c55 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Makoto Onuki <omakoto@google.com>
Date: Fri, 11 Oct 2019 20:19:58 -0700
Subject: [PATCH] Explicitly take flags in createContextAsUser()
@ -16,7 +16,7 @@ Change-Id: Id2e3d5ffe5887a4916e0872a7e85d62cbb439744
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/api/system-current.txt b/api/system-current.txt
index 02e348309fff1..c08667a02b4b1 100644
index 02e348309fff..c08667a02b4b 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -1346,7 +1346,7 @@ package android.content {
@ -29,7 +29,7 @@ index 02e348309fff1..c08667a02b4b1 100644
method @NonNull public android.content.Context createPackageContextAsUser(@NonNull String, int, @NonNull android.os.UserHandle) throws android.content.pm.PackageManager.NameNotFoundException;
method @Nullable public abstract java.io.File getPreloadsFileCache();
diff --git a/api/test-current.txt b/api/test-current.txt
index 5f53b2a40a49e..29c580da327f0 100644
index 5f53b2a40a49..29c580da327f 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -638,7 +638,7 @@ package android.content {
@ -42,10 +42,10 @@ index 5f53b2a40a49e..29c580da327f0 100644
method public abstract android.view.Display getDisplay();
method public abstract int getDisplayId();
diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java
index 1f3c3a46792a6..9c46b23d8df87 100644
index 1f3c3a46792a..9c46b23d8df8 100644
--- a/core/java/android/app/ContextImpl.java
+++ b/core/java/android/app/ContextImpl.java
@@ -2201,9 +2201,9 @@ public Context createPackageContextAsUser(String packageName, int flags, UserHan
@@ -2201,9 +2201,9 @@ class ContextImpl extends Context {
}
@Override
@ -58,10 +58,10 @@ index 1f3c3a46792a6..9c46b23d8df87 100644
throw new IllegalStateException("Own package not found: package=" + getPackageName());
}
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index 713287d26f80c..c161f81835844 100644
index 713287d26f80..c161f8183584 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -5216,7 +5216,7 @@ public Context createPackageContextAsUser(
@@ -5216,7 +5216,7 @@ public abstract class Context {
@SystemApi
@TestApi
@NonNull
@ -71,10 +71,10 @@ index 713287d26f80c..c161f81835844 100644
throw new IllegalStateException("createContextAsUser not overridden!");
}
diff --git a/core/java/android/content/ContextWrapper.java b/core/java/android/content/ContextWrapper.java
index f7cd51e7ffbca..7993ea192424b 100644
index f7cd51e7ffbc..7993ea192424 100644
--- a/core/java/android/content/ContextWrapper.java
+++ b/core/java/android/content/ContextWrapper.java
@@ -885,8 +885,8 @@ public Context createPackageContextAsUser(String packageName, int flags, UserHan
@@ -885,8 +885,8 @@ public class ContextWrapper extends Context {
/** @hide */
@Override
@ -86,10 +86,10 @@ index f7cd51e7ffbca..7993ea192424b 100644
/** @hide */
diff --git a/test-mock/src/android/test/mock/MockContext.java b/test-mock/src/android/test/mock/MockContext.java
index fcd4701c76307..5053ceedc7031 100644
index fcd4701c7630..5053ceedc703 100644
--- a/test-mock/src/android/test/mock/MockContext.java
+++ b/test-mock/src/android/test/mock/MockContext.java
@@ -758,7 +758,7 @@ public Context createPackageContextAsUser(String packageName, int flags, UserHan
@@ -758,7 +758,7 @@ public class MockContext extends Context {
/** {@hide} */
@Override

32
Patches/LineageOS-17.1/android_frameworks_base/399085.patch
View File

@ -1,4 +1,4 @@
From f0d3e98bb01f4caf292539e98cdf174dacb92444 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C3=ADas=20Hern=C3=A1ndez?= <matiashe@google.com>
Date: Fri, 22 Mar 2024 14:26:23 +0100
Subject: [PATCH] Resolve message/conversation image Uris with the correct user
@ -17,10 +17,10 @@ Change-Id: I11c5b39f2d9d8f0788acab43640a6d4abcd5a179
4 files changed, 68 insertions(+), 3 deletions(-)
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java
index 37f7802909357..2004db5005a63 100644
index 37f780290935..2004db5005a6 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java
@@ -44,6 +44,7 @@
@@ -44,6 +44,7 @@ import android.os.AsyncTask;
import android.os.Build;
import android.os.Bundle;
import android.os.SystemClock;
@ -28,7 +28,7 @@ index 37f7802909357..2004db5005a63 100644
import android.service.notification.StatusBarNotification;
import android.util.ArraySet;
import android.util.AttributeSet;
@@ -446,6 +447,8 @@ private void setIconRunning(ImageView imageView, boolean running) {
@@ -446,6 +447,8 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
public void setEntry(@NonNull NotificationEntry entry) {
mEntry = entry;
mStatusBarNotification = entry.notification;
@ -37,7 +37,7 @@ index 37f7802909357..2004db5005a63 100644
cacheIsSystemNotification();
}
@@ -1640,8 +1643,6 @@ public ExpandableNotificationRow(Context context, AttributeSet attrs) {
@@ -1640,8 +1643,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
mFalsingManager = Dependency.get(FalsingManager.class); // TODO: inject into a controller.
mNotificationInflater = new NotificationContentInflater(this);
mMenuRow = new NotificationMenuRow(mContext);
@ -46,7 +46,7 @@ index 37f7802909357..2004db5005a63 100644
mMediaManager = Dependency.get(NotificationMediaManager.class);
initDimens();
}
@@ -1654,6 +1655,14 @@ public void setStatusBarStateController(StatusBarStateController statusBarStateC
@@ -1654,6 +1655,14 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
mStatusbarStateController = statusBarStateController;
}
@ -62,10 +62,10 @@ index 37f7802909357..2004db5005a63 100644
mNotificationMinHeightBeforeN = NotificationUtils.getFontScaledHeight(mContext,
R.dimen.notification_min_height_legacy);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationInlineImageResolver.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationInlineImageResolver.java
index 466be072afdb3..885b28aebc897 100644
index 466be072afdb..885b28aebc89 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationInlineImageResolver.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationInlineImageResolver.java
@@ -26,6 +26,7 @@
@@ -26,6 +26,7 @@ import android.os.Parcelable;
import android.os.SystemClock;
import android.util.Log;
@ -82,7 +82,7 @@ index 466be072afdb3..885b28aebc897 100644
mImageCache = imageCache;
if (mImageCache != null) {
@@ -62,6 +63,11 @@ public NotificationInlineImageResolver(Context context, ImageCache imageCache) {
@@ -62,6 +63,11 @@ public class NotificationInlineImageResolver implements ImageResolver {
}
}
@ -95,7 +95,7 @@ index 466be072afdb3..885b28aebc897 100644
* Check if this resolver has its internal cache implementation.
* @return True if has its internal cache, false otherwise.
diff --git a/packages/SystemUI/tests/src/com/android/systemui/SysuiTestableContext.java b/packages/SystemUI/tests/src/com/android/systemui/SysuiTestableContext.java
index f792d7d11e157..6324569411ed3 100644
index f792d7d11e15..6324569411ed 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/SysuiTestableContext.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/SysuiTestableContext.java
@@ -14,15 +14,20 @@
@ -119,7 +119,7 @@ index f792d7d11e157..6324569411ed3 100644
public SysuiTestableContext(Context base) {
super(base);
@@ -59,4 +64,22 @@ public Context createDisplayContext(Display display) {
@@ -59,4 +64,22 @@ public class SysuiTestableContext extends TestableContext implements SysUiServic
new SysuiTestableContext(getBaseContext().createDisplayContext(display));
return context;
}
@ -143,10 +143,10 @@ index f792d7d11e157..6324569411ed3 100644
+ }
}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowTest.java
index d526d104630eb..c9b29fe7e4903 100644
index d526d104630e..c9b29fe7e490 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowTest.java
@@ -21,6 +21,10 @@
@@ -21,6 +21,10 @@ import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
import static com.android.systemui.statusbar.notification.row.NotificationContentInflater.FLAG_CONTENT_VIEW_ALL;
import static com.android.systemui.statusbar.notification.row.NotificationContentInflater.FLAG_CONTENT_VIEW_HEADS_UP;
import static com.android.systemui.statusbar.notification.row.NotificationContentInflater.FLAG_CONTENT_VIEW_PUBLIC;
@ -157,7 +157,7 @@ index d526d104630eb..c9b29fe7e4903 100644
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -38,6 +42,8 @@
@@ -38,6 +42,8 @@ import static org.mockito.Mockito.when;
import android.app.AppOpsManager;
import android.app.NotificationChannel;
@ -166,7 +166,7 @@ index d526d104630eb..c9b29fe7e4903 100644
import android.testing.AndroidTestingRunner;
import android.testing.TestableLooper;
import android.testing.TestableLooper.RunWithLooper;
@@ -48,6 +54,7 @@
@@ -48,6 +54,7 @@ import android.view.View;
import androidx.test.filters.SmallTest;
import com.android.systemui.SysuiTestCase;
@ -174,7 +174,7 @@ index d526d104630eb..c9b29fe7e4903 100644
import com.android.systemui.plugins.statusbar.NotificationMenuRowPlugin;
import com.android.systemui.plugins.statusbar.StatusBarStateController;
import com.android.systemui.statusbar.NotificationTestHelper;
@@ -377,4 +384,24 @@ public void testGetIsNonblockable_criticalDeviceFunction() throws Exception {
@@ -377,4 +384,24 @@ public class ExpandableNotificationRowTest extends SysuiTestCase {
assertTrue(row.getIsNonblockable());
}

12
Patches/LineageOS-17.1/android_frameworks_base/399086.patch
View File

@ -1,8 +1,8 @@
From 7b923d459cadbe1ab11cfd1b552d9bf9725f0506 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Ameer Armaly <aarmaly@google.com>
Date: Fri, 8 Mar 2024 19:41:06 +0000
Subject: [PATCH] [RESTRICT AUTOMERGE] AccessibilityManagerService: remove
uninstalled services from enabled list after service update.
Subject: [PATCH] AccessibilityManagerService: remove uninstalled services from
enabled list after service update.
Bug: 326485767
Test: atest AccessibilityEndToEndTest#testUpdateServiceWithoutIntent_disablesService
@ -14,10 +14,10 @@ Change-Id: I5e59296fcad68e62b34c74ee5fd80b6ad6b46fa1
1 file changed, 22 insertions(+)
diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
index 194c90e125f95..dbc9d42a4adc7 100644
index 194c90e125f9..dbc9d42a4adc 100644
--- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
+++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
@@ -1623,10 +1623,13 @@ private void updateServicesLocked(UserState userState) {
@@ -1623,10 +1623,13 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
boolean isUnlockingOrUnlocked = LocalServices.getService(UserManagerInternal.class)
.isUserUnlockingOrUnlocked(userState.mUserId);
@ -31,7 +31,7 @@ index 194c90e125f95..dbc9d42a4adc7 100644
AccessibilityServiceConnection service = componentNameToServiceMap.get(componentName);
@@ -1673,6 +1676,25 @@ private void updateServicesLocked(UserState userState) {
@@ -1673,6 +1676,25 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
if (audioManager != null) {
audioManager.setAccessibilityServiceUids(mTempIntArray);
}

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

@ -1,7 +1,7 @@
From 1e4f397dc110954bdc6baffff51f72cbaad0c142 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martijn Coenen <maco@google.com>
Date: Thu, 29 Feb 2024 12:03:05 +0000
Subject: [PATCH] [BACKPORT] Verify UID of incoming Zygote connections.
Subject: [PATCH] Verify UID of incoming Zygote connections.
Only the system UID should be allowed to connect to the Zygote. While
for generic Zygotes this is also covered by SELinux policy, this is not
@ -33,7 +33,7 @@ Change-Id: I3f85a17107849e2cd3e82d6ef15c90b9e2f26532
1 file changed, 3 insertions(+)
diff --git a/core/java/com/android/internal/os/ZygoteConnection.java b/core/java/com/android/internal/os/ZygoteConnection.java
index 52d0adba0a057..fe2ff54194fb9 100644
index 52d0adba0a05..fe2ff54194fb 100644
--- a/core/java/com/android/internal/os/ZygoteConnection.java
+++ b/core/java/com/android/internal/os/ZygoteConnection.java
@@ -106,6 +106,9 @@ class ZygoteConnection {

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

@ -1,4 +1,4 @@
From fb2b0d4aa1a756807fdd2944137dce30cdd0b57b Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Yi-an Chen <theianchen@google.com>
Date: Tue, 23 Apr 2024 21:53:02 +0000
Subject: [PATCH] Fix security vulnerability of non-dynamic permission removal
@ -23,10 +23,10 @@ Change-Id: Id573b75cdcfce3a1df5731ffb00c4228c513e686
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
index ed551795aad58..b342f443d9acc 100644
index ed551795aad5..b342f443d9ac 100644
--- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
+++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
@@ -1011,7 +1011,7 @@ private void removeDynamicPermission(
@@ -1011,7 +1011,7 @@ public class PermissionManagerService {
if (bp == null) {
return;
}

8
Patches/LineageOS-17.1/android_frameworks_base/399413.patch
View File

@ -1,7 +1,7 @@
From 5c4218a6ed99e78a1c1b34fbecda7a9b4457f655 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Guojing Yuan <guojing@google.com>
Date: Thu, 14 Dec 2023 19:30:04 +0000
Subject: [PATCH] [BACKPORT] Check permissions for CDM shell commands
Subject: [PATCH] Check permissions for CDM shell commands
Override handleShellCommand instead of onShellCommand because
Binder.onShellCommand checks the necessary permissions of the caller.
@ -23,10 +23,10 @@ Change-Id: I5539b3594feb5544c458c0fd1061b51a0a808900
1 file changed, 5 insertions(+)
diff --git a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
index 73b8ff7067ef9..4377ee6145d8f 100644
index 73b8ff7067ef..4377ee6145d8 100644
--- a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
+++ b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
@@ -366,6 +366,11 @@ private void checkUsesFeature(String pkg, int userId) {
@@ -366,6 +366,11 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
public void onShellCommand(FileDescriptor in, FileDescriptor out, FileDescriptor err,
String[] args, ShellCallback callback, ResultReceiver resultReceiver)
throws RemoteException {

10
Patches/LineageOS-17.1/android_frameworks_base/399414.patch
View File

@ -1,4 +1,4 @@
From db3da396bd7fc0c1a6abc288b3098840742f8d16 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Riddle Hsu <riddlehsu@google.com>
Date: Tue, 6 Feb 2024 17:19:37 +0800
Subject: [PATCH] Hide window immediately if itself doesn't run hide animation
@ -21,10 +21,10 @@ Change-Id: Iafc2b2c2a24d8fc8d147354ef2f0b4afeeb510c5
2 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java
index 18cdc943b8c85..cca14d884cdd8 100644
index 18cdc943b8c8..cca14d884cdd 100644
--- a/services/core/java/com/android/server/wm/WindowState.java
+++ b/services/core/java/com/android/server/wm/WindowState.java
@@ -2698,8 +2698,10 @@ boolean hideLw(boolean doAnimation, boolean requestAnim) {
@@ -2698,8 +2698,10 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
return false;
}
if (doAnimation) {
@ -38,10 +38,10 @@ index 18cdc943b8c85..cca14d884cdd8 100644
}
}
diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java b/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java
index 3a8d3b74c08f8..15d0fd90ef774 100644
index 3a8d3b74c08f..15d0fd90ef77 100644
--- a/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java
@@ -213,6 +213,26 @@ public void testIsOnScreen_hiddenByPolicy() {
@@ -213,6 +213,26 @@ public class WindowStateTests extends WindowTestsBase {
assertTrue(window.isOnScreen());
window.hideLw(false /* doAnimation */);
assertFalse(window.isOnScreen());

8
Patches/LineageOS-17.1/android_frameworks_base/399739.patch
View File

@ -1,4 +1,4 @@
From 45ee08b07a12600ead2f3a789d60094c9d886fb8 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Kiran S <krns@google.com>
Date: Mon, 13 May 2024 05:49:06 +0000
Subject: [PATCH] Restrict USB poups while setup is in progress
@ -14,7 +14,7 @@ Change-Id: I7d54534696fd73f3b94c5b4250142eed9341c5d8
1 file changed, 21 insertions(+)
diff --git a/services/usb/java/com/android/server/usb/UsbProfileGroupSettingsManager.java b/services/usb/java/com/android/server/usb/UsbProfileGroupSettingsManager.java
index d7b6b5d0d36a2..de49091759df3 100644
index 74c3939a1b1c..2e25798b25d8 100644
--- a/services/usb/java/com/android/server/usb/UsbProfileGroupSettingsManager.java
+++ b/services/usb/java/com/android/server/usb/UsbProfileGroupSettingsManager.java
@@ -16,6 +16,8 @@
@ -26,7 +26,7 @@ index d7b6b5d0d36a2..de49091759df3 100644
import static com.android.internal.app.IntentForwarderActivity.FORWARD_INTENT_TO_MANAGED_PROFILE;
import android.annotation.NonNull;
@@ -42,6 +44,7 @@
@@ -42,6 +44,7 @@ import android.os.AsyncTask;
import android.os.Environment;
import android.os.UserHandle;
import android.os.UserManager;
@ -34,7 +34,7 @@ index d7b6b5d0d36a2..de49091759df3 100644
import android.service.usb.UsbProfileGroupSettingsManagerProto;
import android.service.usb.UsbSettingsAccessoryPreferenceProto;
import android.service.usb.UsbSettingsDevicePreferenceProto;
@@ -900,10 +903,28 @@ private void resolveActivity(Intent intent, UsbDevice device, boolean showMtpNot
@@ -762,10 +765,28 @@ class UsbProfileGroupSettingsManager {
return;
}

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

@ -1,4 +1,4 @@
From 644e95940f57497b7dd155d42f6b0bf42b5540b3 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Linus Tufvesson <lus@google.com>
Date: Mon, 29 Apr 2024 16:32:15 +0200
Subject: [PATCH] Hide SAW subwindows
@ -17,10 +17,10 @@ Change-Id: If19240f5aec2e048de80d75cbbdc00be47622d7f
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java
index 319b7e88258db..12c301b300d69 100644
index cca14d884cdd..4c0aa6492f91 100644
--- a/services/core/java/com/android/server/wm/WindowState.java
+++ b/services/core/java/com/android/server/wm/WindowState.java
@@ -3041,8 +3041,9 @@ boolean hideLw(boolean doAnimation, boolean requestAnim) {
@@ -2730,8 +2730,9 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
}
void setForceHideNonSystemOverlayWindowIfNeeded(boolean forceHide) {

4
Patches/LineageOS-17.1/android_packages_providers_MediaProvider/399090.patch
View File

@ -1,4 +1,4 @@
From 3ebb06797359a6b2497e843c1e65bf6b4be4bb37 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Omar Eissa <oeissa@google.com>
Date: Mon, 15 Apr 2024 12:04:56 +0000
Subject: [PATCH] Prevent insertion in other users storage volumes
@ -24,7 +24,7 @@ diff --git a/src/com/android/providers/media/MediaProvider.java b/src/com/androi
index 0887bd6ae..4cd4452d0 100644
--- a/src/com/android/providers/media/MediaProvider.java
+++ b/src/com/android/providers/media/MediaProvider.java
@@ -2120,6 +2120,7 @@ private static void ensureFileColumns(int match, Uri uri, ContentValues values,
@@ -2120,6 +2120,7 @@ public class MediaProvider extends ContentProvider {
} catch (FileNotFoundException e) {
throw new IllegalArgumentException(e);
}

6
Patches/LineageOS-17.1/android_system_bt/399092.patch
View File

@ -1,4 +1,4 @@
From 44e273a1121b21cde1d53cd9c86bdd813c9d259f Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Brian Delwiche <delwiche@google.com>
Date: Mon, 22 Apr 2024 21:14:56 +0000
Subject: [PATCH] Fix an authentication bypass bug in SMP
@ -20,7 +20,7 @@ Change-Id: I66b1f9a80060f48a604001829db8ea7c96c7b7f8
2 files changed, 13 insertions(+)
diff --git a/stack/smp/smp_act.cc b/stack/smp/smp_act.cc
index c1f143e925e..199c5abb37b 100644
index c1f143e92..199c5abb3 100644
--- a/stack/smp/smp_act.cc
+++ b/stack/smp/smp_act.cc
@@ -284,6 +284,7 @@ void smp_send_pair_rsp(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
@ -50,7 +50,7 @@ index c1f143e925e..199c5abb37b 100644
STREAM_TO_ARRAY(p_cb->rrand.data(), p, OCTET16_LEN);
}
diff --git a/stack/smp/smp_int.h b/stack/smp/smp_int.h
index 72fdf55a963..e3063c57d2f 100644
index 72fdf55a9..e3063c57d 100644
--- a/stack/smp/smp_int.h
+++ b/stack/smp/smp_int.h
@@ -241,6 +241,7 @@ typedef union {

6
Patches/LineageOS-17.1/android_system_bt/399742.patch
View File

@ -1,4 +1,4 @@
From 2c0deba7d780ae11d16fc675fc6aa9abba344fd7 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Brian Delwiche <delwiche@google.com>
Date: Mon, 22 Apr 2024 16:43:29 +0000
Subject: [PATCH] Fix heap-buffer overflow in sdp_utils.cc
@ -24,10 +24,10 @@ Change-Id: Ib536cbeac454efbf6af3d713c05c8e3e077e069b
1 file changed, 22 insertions(+), 2 deletions(-)
diff --git a/stack/sdp/sdp_utils.cc b/stack/sdp/sdp_utils.cc
index f8cde2c34c5..9581dc72a77 100644
index 33f30b042..94368ecbc 100644
--- a/stack/sdp/sdp_utils.cc
+++ b/stack/sdp/sdp_utils.cc
@@ -949,8 +949,28 @@ bool sdpu_compare_uuid_arrays(uint8_t* p_uuid1, uint32_t len1, uint8_t* p_uuid2,
@@ -943,8 +943,28 @@ bool sdpu_compare_uuid_arrays(uint8_t* p_uuid1, uint32_t len1, uint8_t* p_uuid2,
******************************************************************************/
bool sdpu_compare_uuid_with_attr(const Uuid& uuid, tSDP_DISC_ATTR* p_attr) {
int len = uuid.GetShortestRepresentationSize();

2
Patches/LineageOS-17.1/android_vendor_qcom_opensource_system_bt/399091.patch
View File

@ -1,4 +1,4 @@
From 1c72baf0b3f59b8e43e96202e90cb19e2c0a635b Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Brian Delwiche <delwiche@google.com>
Date: Mon, 22 Apr 2024 21:14:56 +0000
Subject: [PATCH] Fix an authentication bypass bug in SMP

4
Patches/LineageOS-17.1/android_vendor_qcom_opensource_system_bt/399743.patch
View File

@ -1,4 +1,4 @@
From f33554bf3b2998d04a78d19c46d9db26f2d27478 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Brian Delwiche <delwiche@google.com>
Date: Mon, 22 Apr 2024 16:43:29 +0000
Subject: [PATCH] Fix heap-buffer overflow in sdp_utils.cc
@ -24,7 +24,7 @@ Change-Id: Ib536cbeac454efbf6af3d713c05c8e3e077e069b
1 file changed, 22 insertions(+), 2 deletions(-)
diff --git a/stack/sdp/sdp_utils.cc b/stack/sdp/sdp_utils.cc
index ec48361fd..66f52c32f 100644
index 9310770c6..93625ed4b 100644
--- a/stack/sdp/sdp_utils.cc
+++ b/stack/sdp/sdp_utils.cc
@@ -739,8 +739,28 @@ bool sdpu_compare_uuid_arrays(uint8_t* p_uuid1, uint32_t len1, uint8_t* p_uuid2,