Skip to content
This repository was archived by the owner on Dec 23, 2024. It is now read-only.

Commit f1c027e

Browse files
SkewedZeppelinSkewedZeppelin
committed
Churn + Fixes
Signed-off-by: Tavi <[email protected]>
1 parent fcd8808 commit f1c027e

File tree

15 files changed

+46
-45
lines changed

15 files changed

+46
-45
lines changed

‎Logs/resetWorkspace-LineageOS-15.1.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ external/caliper 4a0d9aba0856d0aa965d5653bfa4c138f0e8a8ba
6868
external/cblas d063db8bdddfcde61e4bad3bfe65941fd73e8094
6969
external/chromium-libpac 0ac78251d11006d764ba1aad8cc0867827fafe5c
7070
external/chromium-trace 8b2c0074e71a8086dee98ca8730acfdc5eddf7a1
71-
external/chromium-webview 18024297bc95fb233a92b15d8bf26c9b987bda66
71+
external/chromium-webview ef62acbe255f65218a2122885a27624a0178ba14
7272
external/clang 751a76679b0fb5798ea6cab75906df07edcab315
7373
external/cmockery 9199c7bfafefea32d1884182fa655b6e4578c1c4
7474
external/compiler-rt 0c46c9e892a3f68420635032ef2f6152dabd197c

‎Logs/resetWorkspace-LineageOS-16.0.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ external/capstone 6788a4139092f179005f7cdbf181ba24b60b6113
6767
external/cblas ddf5f49cb53866fbc503a6349bf44bac24a6963d
6868
external/chromium-libpac dff5ddb8d28f6ac9a86eb28763b4313f6f72eec5
6969
external/chromium-trace b2cf025c7d5cebd43084f38c6c7ff9cc17da428a
70-
external/chromium-webview 18024297bc95fb233a92b15d8bf26c9b987bda66
70+
external/chromium-webview ef62acbe255f65218a2122885a27624a0178ba14
7171
external/clang f9d2af42fc6d74c28893af371e4647158eaba66c
7272
external/cmockery 9199c7bfafefea32d1884182fa655b6e4578c1c4
7373
external/cn-cbor 7fe9f01990a97be4df5e46d2decd894c06678072

‎Patches/LineageOS-15.1/android_frameworks_base/394878.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 2d2a31353a07daf096aa9e2ca09e18ad2773b1ba Mon Sep 17 00:00:00 2001
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
22
From: Dmitry Dementyev <[email protected]>
33
Date: Tue, 26 Mar 2024 10:31:44 -0700
44
Subject: [PATCH] Add more checkKeyIntent checks to AccountManagerService.
@@ -14,10 +14,10 @@ Change-Id: I9e45d758a2320328da5664b6341eafe6f285f297
1414
1 file changed, 10 insertions(+)
1515

1616
diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java
17-
index 4e4c261d0cc46..19e1a4c55120a 100644
17+
index b06fce9128e6..45c56e41d7fb 100644
1818
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java
1919
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
20-
@@ -3453,6 +3453,11 @@ public void onResult(Bundle result) {
20+
@@ -3441,6 +3441,11 @@ public class AccountManagerService
2121

2222
// Strip auth token from result.
2323
result.remove(AccountManager.KEY_AUTHTOKEN);
@@ -29,7 +29,7 @@ index 4e4c261d0cc46..19e1a4c55120a 100644
2929

3030
if (Log.isLoggable(TAG, Log.VERBOSE)) {
3131
Log.v(TAG,
32-
@@ -5039,6 +5044,11 @@ public void onResult(Bundle result) {
32+
@@ -5017,6 +5022,11 @@ public class AccountManagerService
3333
} else {
3434
if (mStripAuthTokenFromResult) {
3535
result.remove(AccountManager.KEY_AUTHTOKEN);

‎Patches/LineageOS-15.1/android_frameworks_base/394879.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From a568a9144f1a804e4ac136522dfcd1f8aaae81a3 Mon Sep 17 00:00:00 2001
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
22
From: Chris Wailes <[email protected]>
33
Date: Thu, 18 Apr 2019 18:25:57 -0700
44
Subject: [PATCH] Adds additional sanitization for Zygote command arguments.
@@ -18,7 +18,7 @@ Merged-In: I4055c50d52db0047c02c11096710fd07b429660c
1818
1 file changed, 7 insertions(+), 2 deletions(-)
1919

2020
diff --git a/core/java/android/os/ZygoteProcess.java b/core/java/android/os/ZygoteProcess.java
21-
index 6994033a963a8..904ec46859fa4 100644
21+
index 7a13ee89d393..d3eb9ae05fe4 100644
2222
--- a/core/java/android/os/ZygoteProcess.java
2323
+++ b/core/java/android/os/ZygoteProcess.java
2424
@@ -16,6 +16,7 @@
@@ -29,7 +29,7 @@ index 6994033a963a8..904ec46859fa4 100644
2929
import android.net.LocalSocket;
3030
import android.net.LocalSocketAddress;
3131
import android.util.Log;
32-
@@ -278,15 +279,19 @@ private static String getAbiList(BufferedWriter writer, DataInputStream inputStr
32+
@@ -253,15 +254,19 @@ public class ZygoteProcess {
3333
*/
3434
@GuardedBy("mLock")
3535
private static Process.ProcessStartResult zygoteSendArgsAndGetResult(

‎Patches/LineageOS-15.1/android_frameworks_base/394880.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 00ff56bb646c525192f06cbeed96c3dc78d45795 Mon Sep 17 00:00:00 2001
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
22
From: Hans Boehm <[email protected]>
33
Date: Tue, 2 Jan 2024 16:53:13 -0800
44
Subject: [PATCH] Check hidden API exemptions
@@ -18,10 +18,10 @@ Change-Id: I83cd60e46407a4a082f9f3c80e937dbd522dbac4
1818
1 file changed, 2 insertions(+)
1919

2020
diff --git a/core/java/android/os/ZygoteProcess.java b/core/java/android/os/ZygoteProcess.java
21-
index 904ec46859fa4..aab1d9d578031 100644
21+
index d3eb9ae05fe4..69d54b766d29 100644
2222
--- a/core/java/android/os/ZygoteProcess.java
2323
+++ b/core/java/android/os/ZygoteProcess.java
24-
@@ -292,6 +292,8 @@ private static Process.ProcessStartResult zygoteSendArgsAndGetResult(
24+
@@ -267,6 +267,8 @@ public class ZygoteProcess {
2525
throw new ZygoteStartFailedEx("Embedded newlines not allowed");
2626
} else if (args.get(i).indexOf('\r') >= 0) {
2727
throw new ZygoteStartFailedEx("Embedded carriage returns not allowed");

‎Patches/LineageOS-15.1/android_frameworks_base/394882.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 538cc6c384985f272dc7ab6c7cc7222a59b4c341 Mon Sep 17 00:00:00 2001
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
22
From: Guojing Yuan <[email protected]>
33
Date: Thu, 14 Dec 2023 19:30:04 +0000
4-
Subject: [PATCH] [BACKPORT] Check permissions for CDM shell commands
4+
Subject: [PATCH] Check permissions for CDM shell commands
55

66
Override handleShellCommand instead of onShellCommand because
77
Binder.onShellCommand checks the necessary permissions of the caller.
@@ -23,10 +23,10 @@ Change-Id: I5539b3594feb5544c458c0fd1061b51a0a808900
2323
1 file changed, 5 insertions(+)
2424

2525
diff --git a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
26-
index 087fe8560fc80..8ffb53f8a3b9d 100644
26+
index a5c9f67060d7..355fc5cd1c8f 100644
2727
--- a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
2828
+++ b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
29-
@@ -345,6 +345,11 @@ private void checkUsesFeature(String pkg, int userId) {
29+
@@ -348,6 +348,11 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
3030
public void onShellCommand(FileDescriptor in, FileDescriptor out, FileDescriptor err,
3131
String[] args, ShellCallback callback, ResultReceiver resultReceiver)
3232
throws RemoteException {

‎Patches/LineageOS-16.0/android_frameworks_base/394877.patch‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
From 361c828f654b646f968644dbadf8a1f5f8ad67d8 Mon Sep 17 00:00:00 2001
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
22
From: Valentin Iftime <[email protected]>
33
Date: Thu, 1 Feb 2024 13:58:49 +0100
4-
Subject: [PATCH] [BACKPORT] Verify URI permission for channel sound update
5-
from NotificationListenerService
4+
Subject: [PATCH] Verify URI permission for channel sound update from
5+
NotificationListenerService
66

77
Check that a privileged NotificationListenerService (CDM) has the permission to access the sound URI
88
when updating a notification channel.
@@ -19,10 +19,10 @@ Change-Id: Ic7d2e96e43565e98d2aa29b8f2ba35c142387ba9
1919
2 files changed, 79 insertions(+)
2020

2121
diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java
22-
index a1e8cd15fd7ee..e793dc024156a 100755
22+
index a1e8cd15fd7e..e793dc024156 100755
2323
--- a/services/core/java/com/android/server/notification/NotificationManagerService.java
2424
+++ b/services/core/java/com/android/server/notification/NotificationManagerService.java
25-
@@ -3668,6 +3668,10 @@ public void updateNotificationChannelFromPrivilegedListener(INotificationListene
25+
@@ -3668,6 +3668,10 @@ public class NotificationManagerService extends SystemService {
2626
Preconditions.checkNotNull(user);
2727

2828
verifyPrivilegedListener(token, user);
@@ -33,7 +33,7 @@ index a1e8cd15fd7ee..e793dc024156a 100755
3333
updateNotificationChannelInt(pkg, getUidForPackageAndUser(pkg, user), channel, true);
3434
}
3535

36-
@@ -3709,6 +3713,24 @@ private void verifyPrivilegedListener(INotificationListener token, UserHandle us
36+
@@ -3709,6 +3713,24 @@ public class NotificationManagerService extends SystemService {
3737
}
3838
}
3939

@@ -59,10 +59,10 @@ index a1e8cd15fd7ee..e793dc024156a 100755
5959
int uid = 0;
6060
long identity = Binder.clearCallingIdentity();
6161
diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java
62-
index 379290bcf0ad0..db83d8f1a4f07 100644
62+
index 379290bcf0ad..db83d8f1a4f0 100644
6363
--- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java
6464
+++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java
65-
@@ -1681,6 +1681,63 @@ public void testUpdateNotificationChannelFromPrivilegedListener_badUser() throws
65+
@@ -1681,6 +1681,63 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
6666
eq(NotificationListenerService.NOTIFICATION_CHANNEL_OR_GROUP_UPDATED));
6767
}
6868

‎Patches/LineageOS-16.0/android_frameworks_base/394878.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 2d2a31353a07daf096aa9e2ca09e18ad2773b1ba Mon Sep 17 00:00:00 2001
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
22
From: Dmitry Dementyev <[email protected]>
33
Date: Tue, 26 Mar 2024 10:31:44 -0700
44
Subject: [PATCH] Add more checkKeyIntent checks to AccountManagerService.
@@ -14,10 +14,10 @@ Change-Id: I9e45d758a2320328da5664b6341eafe6f285f297
1414
1 file changed, 10 insertions(+)
1515

1616
diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java
17-
index 4e4c261d0cc46..19e1a4c55120a 100644
17+
index 4e4c261d0cc4..19e1a4c55120 100644
1818
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java
1919
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
20-
@@ -3453,6 +3453,11 @@ public void onResult(Bundle result) {
20+
@@ -3453,6 +3453,11 @@ public class AccountManagerService
2121

2222
// Strip auth token from result.
2323
result.remove(AccountManager.KEY_AUTHTOKEN);
@@ -29,7 +29,7 @@ index 4e4c261d0cc46..19e1a4c55120a 100644
2929

3030
if (Log.isLoggable(TAG, Log.VERBOSE)) {
3131
Log.v(TAG,
32-
@@ -5039,6 +5044,11 @@ public void onResult(Bundle result) {
32+
@@ -5039,6 +5044,11 @@ public class AccountManagerService
3333
} else {
3434
if (mStripAuthTokenFromResult) {
3535
result.remove(AccountManager.KEY_AUTHTOKEN);

‎Patches/LineageOS-16.0/android_frameworks_base/394879.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From a568a9144f1a804e4ac136522dfcd1f8aaae81a3 Mon Sep 17 00:00:00 2001
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
22
From: Chris Wailes <[email protected]>
33
Date: Thu, 18 Apr 2019 18:25:57 -0700
44
Subject: [PATCH] Adds additional sanitization for Zygote command arguments.
@@ -18,7 +18,7 @@ Merged-In: I4055c50d52db0047c02c11096710fd07b429660c
1818
1 file changed, 7 insertions(+), 2 deletions(-)
1919

2020
diff --git a/core/java/android/os/ZygoteProcess.java b/core/java/android/os/ZygoteProcess.java
21-
index 6994033a963a8..904ec46859fa4 100644
21+
index 6994033a963a..904ec46859fa 100644
2222
--- a/core/java/android/os/ZygoteProcess.java
2323
+++ b/core/java/android/os/ZygoteProcess.java
2424
@@ -16,6 +16,7 @@
@@ -29,7 +29,7 @@ index 6994033a963a8..904ec46859fa4 100644
2929
import android.net.LocalSocket;
3030
import android.net.LocalSocketAddress;
3131
import android.util.Log;
32-
@@ -278,15 +279,19 @@ private static String getAbiList(BufferedWriter writer, DataInputStream inputStr
32+
@@ -278,15 +279,19 @@ public class ZygoteProcess {
3333
*/
3434
@GuardedBy("mLock")
3535
private static Process.ProcessStartResult zygoteSendArgsAndGetResult(

‎Patches/LineageOS-16.0/android_frameworks_base/394880.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 00ff56bb646c525192f06cbeed96c3dc78d45795 Mon Sep 17 00:00:00 2001
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
22
From: Hans Boehm <[email protected]>
33
Date: Tue, 2 Jan 2024 16:53:13 -0800
44
Subject: [PATCH] Check hidden API exemptions
@@ -18,10 +18,10 @@ Change-Id: I83cd60e46407a4a082f9f3c80e937dbd522dbac4
1818
1 file changed, 2 insertions(+)
1919

2020
diff --git a/core/java/android/os/ZygoteProcess.java b/core/java/android/os/ZygoteProcess.java
21-
index 904ec46859fa4..aab1d9d578031 100644
21+
index 904ec46859fa..aab1d9d57803 100644
2222
--- a/core/java/android/os/ZygoteProcess.java
2323
+++ b/core/java/android/os/ZygoteProcess.java
24-
@@ -292,6 +292,8 @@ private static Process.ProcessStartResult zygoteSendArgsAndGetResult(
24+
@@ -292,6 +292,8 @@ public class ZygoteProcess {
2525
throw new ZygoteStartFailedEx("Embedded newlines not allowed");
2626
} else if (args.get(i).indexOf('\r') >= 0) {
2727
throw new ZygoteStartFailedEx("Embedded carriage returns not allowed");

0 commit comments

Comments
 (0)