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

Commit fcd8808

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

File tree

13 files changed

+78
-99
lines changed

13 files changed

+78
-99
lines changed

‎Logs/resetWorkspace-LineageOS-17.1.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ external/catch2 bcfbb791d09e390fb545c03ca002e570f764d960
7878
external/cblas 61ee00692011385347a5dd1ad872556899a5cf7a
7979
external/chromium-libpac c98fc96035e6fdc5b84d953d2bd38d2dcd175467
8080
external/chromium-trace f4e722b911fcc6f7164026432de62a02ea3460fb
81-
external/chromium-webview 18024297bc95fb233a92b15d8bf26c9b987bda66
81+
external/chromium-webview ef62acbe255f65218a2122885a27624a0178ba14
8282
external/clang 8343f599c9e1dda8e6c1bb779af323a673a052f9
8383
external/cldr 4e0bdd442c1e01f5c6147cf6032ce4f8587f4ede
8484
external/cmockery 9199c7bfafefea32d1884182fa655b6e4578c1c4
@@ -726,7 +726,7 @@ tools/external_updater 1dc2143b13455b4ab0e2a0aa59dda791c0b0084f
726726
tools/loganalysis eec32327da28db6f5e599a4ab76f7c93995896ef
727727
tools/metalava edcafddcb54e149af8d4135a346501dde802fb30
728728
tools/ndkports 74fefbc2160250129cbd157272fcfb3c9ac20f18
729-
tools/repohooks 6ca9412c1ba65e255924a403165d60949bfebd50
729+
tools/repohooks c2c8692c55a22d15d57ae05a226c731aca7cf3ba
730730
tools/security 3c5ee5d6f2f50895611eacd71a62b11efcfb0648
731731
tools/test/connectivity 4857a1a24ab6fd537bc4186fc88548c2b9c29e82
732732
tools/test/graphicsbenchmark 143e833b3762e93b0a1fe6a6bc127f09e5afade8

‎Patches/LineageOS-17.1/android_frameworks_base/0007-Always_Restict_Serial.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ requiring the READ_PHONE_STATE permission.
1010
1 file changed, 1 insertion(+), 6 deletions(-)
1111

1212
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
13-
index 98d7cecd81ca..ad536de06e66 100644
13+
index 41b1ddaf887b..78bdde0c5ef9 100644
1414
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
1515
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
1616
@@ -5025,12 +5025,7 @@ public class ActivityManagerService extends IActivityManager.Stub

‎Patches/LineageOS-17.1/android_frameworks_base/0014-Network_Permission-1.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ index a8dd041454c9..6940b9eb36ed 100644
2222
<!-- Allows applications to access information about networks.
2323
<p>Protection level: normal
2424
diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
25-
index 65646aef6c9e..adf6fa87be3e 100644
25+
index f247610fa8a3..a57a2b819f84 100644
2626
--- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
2727
+++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
28-
@@ -1024,7 +1024,7 @@ public class PermissionManagerService {
28+
@@ -1025,7 +1025,7 @@ public class PermissionManagerService {
2929
}
3030

3131
public static boolean isSpecialRuntimePermission(final String permission) {

‎Patches/LineageOS-17.1/android_frameworks_base/0014-Sensors_Permission.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,10 @@ index 2cf2b923ef90..ae206c1f5872 100644
100100
<string name="permlab_readCalendar">Read calendar events and details</string>
101101
<!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
102102
diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
103-
index adf6fa87be3e..648502f7ba02 100644
103+
index a57a2b819f84..ecbee40cf574 100644
104104
--- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
105105
+++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
106-
@@ -1024,7 +1024,7 @@ public class PermissionManagerService {
106+
@@ -1025,7 +1025,7 @@ public class PermissionManagerService {
107107
}
108108

109109
public static boolean isSpecialRuntimePermission(final String permission) {

‎Patches/LineageOS-17.1/android_frameworks_base/0014-Special_Permissions.patch‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ index d27b5ad0d646..32b022455451 100644
2525
Process.SYSTEM_UID, userId, delayingPermCallback);
2626
// Allow app op later as we are holding mPackages
2727
diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
28-
index 2fcdec7c92d6..65646aef6c9e 100644
28+
index ed551795aad5..f247610fa8a3 100644
2929
--- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
3030
+++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
31-
@@ -1023,6 +1023,10 @@ public class PermissionManagerService {
31+
@@ -1024,6 +1024,10 @@ public class PermissionManagerService {
3232
}
3333
}
3434

@@ -39,7 +39,7 @@ index 2fcdec7c92d6..65646aef6c9e 100644
3939
/**
4040
* Restore the permission state for a package.
4141
*
42-
@@ -1322,6 +1326,14 @@ public class PermissionManagerService {
42+
@@ -1323,6 +1327,14 @@ public class PermissionManagerService {
4343
}
4444
}
4545
}
@@ -54,7 +54,7 @@ index 2fcdec7c92d6..65646aef6c9e 100644
5454
} else {
5555
if (permState == null) {
5656
// New permission
57-
@@ -1455,7 +1467,7 @@ public class PermissionManagerService {
57+
@@ -1456,7 +1468,7 @@ public class PermissionManagerService {
5858
wasChanged = true;
5959
}
6060
}
@@ -63,7 +63,7 @@ index 2fcdec7c92d6..65646aef6c9e 100644
6363
if (!permissionsState.hasRuntimePermission(bp.name, userId)
6464
&& permissionsState.grantRuntimePermission(bp,
6565
userId) != PERMISSION_OPERATION_FAILURE) {
66-
@@ -2233,7 +2245,7 @@ public class PermissionManagerService {
66+
@@ -2234,7 +2246,7 @@ public class PermissionManagerService {
6767
&& (grantedPermissions == null
6868
|| ArrayUtils.contains(grantedPermissions, permission))) {
6969
final int flags = permissionsState.getPermissionFlags(permission, userId);
@@ -72,7 +72,7 @@ index 2fcdec7c92d6..65646aef6c9e 100644
7272
// Installer cannot change immutable permissions.
7373
if ((flags & immutableFlags) == 0) {
7474
grantRuntimePermission(permission, pkg.packageName, false, callingUid,
75-
@@ -2292,7 +2304,7 @@ public class PermissionManagerService {
75+
@@ -2293,7 +2305,7 @@ public class PermissionManagerService {
7676
// to keep the review required permission flag per user while an
7777
// install permission's state is shared across all users.
7878
if (pkg.applicationInfo.targetSdkVersion < Build.VERSION_CODES.M
@@ -81,7 +81,7 @@ index 2fcdec7c92d6..65646aef6c9e 100644
8181
return;
8282
}
8383

84-
@@ -2344,7 +2356,8 @@ public class PermissionManagerService {
84+
@@ -2345,7 +2357,8 @@ public class PermissionManagerService {
8585
+ permName + " for package " + packageName);
8686
}
8787

@@ -91,7 +91,7 @@ index 2fcdec7c92d6..65646aef6c9e 100644
9191
Slog.w(TAG, "Cannot grant runtime permission to a legacy app");
9292
return;
9393
}
94-
@@ -2431,7 +2444,7 @@ public class PermissionManagerService {
94+
@@ -2432,7 +2445,7 @@ public class PermissionManagerService {
9595
// to keep the review required permission flag per user while an
9696
// install permission's state is shared across all users.
9797
if (pkg.applicationInfo.targetSdkVersion < Build.VERSION_CODES.M

‎Patches/LineageOS-17.1/android_frameworks_base/394553.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 00961ad29e26dde5d4f56de90ac333ceb2fc8d34 Mon Sep 17 00:00:00 2001
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
22
From: Jing Ji <[email protected]>
33
Date: Tue, 25 Oct 2022 22:39:52 -0700
44
Subject: [PATCH] DO NOT MERGE: ActivityManager#killBackgroundProcesses can
@@ -19,10 +19,10 @@ Change-Id: I41cd6fa1f71e950db18a9fd450355c4e6f80ec7d
1919
1 file changed, 16 insertions(+)
2020

2121
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
22-
index 234b23a996267..815ddf63e565a 100644
22+
index 98d7cecd81ca..bcb7276b4014 100644
2323
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
2424
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
25-
@@ -4486,6 +4486,22 @@ void killAllBackgroundProcessesExcept(int minTargetSdk, int maxProcState) {
25+
@@ -4217,6 +4217,22 @@ public class ActivityManagerService extends IActivityManager.Stub
2626
throw new SecurityException(msg);
2727
}
2828

‎Patches/LineageOS-17.1/android_frameworks_base/394554.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 14804676d97278009b746073e8339374b0cce927 Mon Sep 17 00:00:00 2001
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
22
From: Jing Ji <[email protected]>
33
Date: Thu, 19 Oct 2023 14:22:58 -0700
44
Subject: [PATCH] DO NOT MERGE: Fix ActivityManager#killBackgroundProcesses
@@ -18,10 +18,10 @@ Change-Id: I9471a77188ee63ec32cd0c81569193e4ccad885b
1818
1 file changed, 16 deletions(-)
1919

2020
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
21-
index 815ddf63e565a..234b23a996267 100644
21+
index bcb7276b4014..41b1ddaf887b 100644
2222
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
2323
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
24-
@@ -4486,22 +4486,6 @@ void killAllBackgroundProcessesExcept(int minTargetSdk, int maxProcState) {
24+
@@ -4268,22 +4268,6 @@ public class ActivityManagerService extends IActivityManager.Stub
2525
throw new SecurityException(msg);
2626
}
2727

‎Patches/LineageOS-17.1/android_frameworks_base/394559.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 18d1359a28cee22491dbe2f8b814ab999348ebfa 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 8a9ddda50d63b..37a68d3eec76c 100644
17+
index 326acdfe3a3f..bf577735d037 100644
1818
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java
1919
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
20-
@@ -3475,6 +3475,11 @@ public void onResult(Bundle result) {
20+
@@ -3479,6 +3479,11 @@ public class AccountManagerService
2121

2222
// Strip auth token from result.
2323
result.remove(AccountManager.KEY_AUTHTOKEN);
@@ -29,7 +29,7 @@ index 8a9ddda50d63b..37a68d3eec76c 100644
2929

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

‎Patches/LineageOS-17.1/android_frameworks_base/394560.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From a0059406f6fa6fa600bd6d5fc488de1d3aa956af Mon Sep 17 00:00:00 2001
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
22
From: Haoran Zhang <[email protected]>
33
Date: Wed, 13 Mar 2024 17:08:00 +0000
44
Subject: [PATCH] Add in check for intent filter when setting/updating service
@@ -20,10 +20,10 @@ Change-Id: I51c2e3788ac29ff4d6b86aa2a735ff2ea1463a77
2020
1 file changed, 27 insertions(+)
2121

2222
diff --git a/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java b/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java
23-
index 57ffe0498a88e..309f78006d4b6 100644
23+
index 1bd5201f5b26..58a1064682d3 100644
2424
--- a/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java
2525
+++ b/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java
26-
@@ -32,8 +32,10 @@
26+
@@ -32,8 +32,10 @@ import android.app.ActivityManagerInternal;
2727
import android.app.ActivityTaskManager;
2828
import android.app.IActivityTaskManager;
2929
import android.content.ComponentName;
@@ -34,7 +34,7 @@ index 57ffe0498a88e..309f78006d4b6 100644
3434
import android.content.pm.ServiceInfo;
3535
import android.graphics.Rect;
3636
import android.metrics.LogMaker;
37-
@@ -235,6 +237,31 @@ protected boolean updateLocked(boolean disabled) {
37+
@@ -214,6 +216,31 @@ final class AutofillManagerServiceImpl
3838
@Override // from PerUserSystemService
3939
protected ServiceInfo newServiceInfoLocked(@NonNull ComponentName serviceComponent)
4040
throws NameNotFoundException {

‎Patches/LineageOS-17.1/android_frameworks_base/394561.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From a0d6c266c99cdcdba0ef4674cf6995619f13efa7 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, 10 insertions(+)
1919

2020
diff --git a/core/java/android/os/ZygoteProcess.java b/core/java/android/os/ZygoteProcess.java
21-
index 39038f555044e..4d69f217c5e6a 100644
21+
index 0417a4c8959c..ff4131c2398d 100644
2222
--- a/core/java/android/os/ZygoteProcess.java
2323
+++ b/core/java/android/os/ZygoteProcess.java
24-
@@ -431,6 +431,8 @@ private Process.ProcessStartResult zygoteSendArgsAndGetResult(
24+
@@ -411,6 +411,8 @@ public class ZygoteProcess {
2525
throw new ZygoteStartFailedEx("Embedded newlines not allowed");
2626
} else if (arg.indexOf('\r') >= 0) {
2727
throw new ZygoteStartFailedEx("Embedded carriage returns not allowed");
@@ -30,7 +30,7 @@ index 39038f555044e..4d69f217c5e6a 100644
3030
}
3131
}
3232

33-
@@ -980,6 +982,14 @@ private boolean maybeSetApiBlacklistExemptions(ZygoteState state, boolean sendIf
33+
@@ -869,6 +871,14 @@ public class ZygoteProcess {
3434
return true;
3535
}
3636

0 commit comments

Comments
 (0)