nehemiah-zb/lineage_patches_unified
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changes for April 2024

Browse Source
This commit is contained in:
Andy CrossGate Yan
2024-04-21 16:33:07 +08:00
parent ea765d3ff5
commit 94f14a03d8
103 changed files with 2234 additions and 1162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches_treble/frameworks_base/0001-Re-implement-fnmatch-like-behaviour-for-RRO-java-sid.patch
View File

@@ -1,4 +1,4 @@
From 36920a508f5c97585652116c356451ae759bf946 Mon Sep 17 00:00:00 2001
From 3eca40aa6c2b4ef6e519556a109067d1be82dea0 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sun, 25 Oct 2020 23:57:26 +0100
Subject: [PATCH 1/5] Re-implement fnmatch-like behaviour for RRO java-side
@@ -11,7 +11,7 @@ Change-Id: Id38292a9a1453aa87b8401c1fdb390fa4e63c7d1
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/core/java/android/content/pm/parsing/FrameworkParsingPackageUtils.java b/core/java/android/content/pm/parsing/FrameworkParsingPackageUtils.java
index b75ba82ad091..b344f7232190 100644
index fc06dd8de3b6..41da26bff956 100644
--- a/core/java/android/content/pm/parsing/FrameworkParsingPackageUtils.java
+++ b/core/java/android/content/pm/parsing/FrameworkParsingPackageUtils.java
@@ -223,8 +223,17 @@ public class FrameworkParsingPackageUtils {

10
patches_treble/frameworks_base/0002-LightsService-Alternative-backlight-scale.patch
View File

@@ -1,4 +1,4 @@
From 69fbb22f3d265d9baf7ba87c2e0d42671a898037 Mon Sep 17 00:00:00 2001
From cf5d89e76aa67ca83e682a9e091e6ddc7e43fd41 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sat, 24 Mar 2018 08:01:48 +0100
Subject: [PATCH 2/5] LightsService: Alternative backlight scale
@@ -11,18 +11,18 @@ Change-Id: I46ae69c758d1a4609d89cf1c293488ea5fc76787
1 file changed, 13 insertions(+)
diff --git a/services/core/java/com/android/server/lights/LightsService.java b/services/core/java/com/android/server/lights/LightsService.java
index fea6b29d9260..2a9a3b63ea2e 100644
index 4d26f43307b2..c5e672726d21 100644
--- a/services/core/java/com/android/server/lights/LightsService.java
+++ b/services/core/java/com/android/server/lights/LightsService.java
@@ -32,6 +32,7 @@ import android.os.IBinder;
import android.os.Looper;
@@ -32,6 +32,7 @@ import android.os.Looper;
import android.os.PermissionEnforcer;
import android.os.RemoteException;
import android.os.ServiceManager;
+import android.os.SystemProperties;
import android.os.Trace;
import android.provider.Settings;
import android.util.Slog;
@@ -295,6 +296,18 @@ public class LightsService extends SystemService {
@@ -298,6 +299,18 @@ public class LightsService extends SystemService {
return;
}
int brightnessInt = BrightnessSynchronizer.brightnessFloatToInt(brightness);

39
patches_treble/frameworks_base/0003-Revert-Remove-more-FDE-methods-from-StorageManager.patch
View File

@@ -1,4 +1,4 @@
From f5e64bb671b92afc7e9d897c950f3c51aebfe882 Mon Sep 17 00:00:00 2001
From 09e7b9a70cfe3ac0bf4f4791bed3b0dd663f06f1 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sat, 15 Oct 2022 09:33:56 +0000
Subject: [PATCH 3/5] Revert "Remove more FDE methods from StorageManager"
@@ -7,15 +7,15 @@ This reverts commit bd13f84152449a3ead6fa8604fd31f48c0224676.
Change-Id: Ic394934ec27b1a486c60123130825d44dad73412
---
.../android/os/storage/StorageManager.java | 57 +++++++++++++++++++
.../internal/os/RoSystemProperties.java | 4 ++
2 files changed, 61 insertions(+)
.../android/os/storage/StorageManager.java | 74 +++++++++++++++++++
.../internal/os/RoSystemProperties.java | 4 +
2 files changed, 78 insertions(+)
diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java
index 80dd48825ba7..cb4769ff4ec3 100644
index 78a12f75a508..f9999fa8fde8 100644
--- a/core/java/android/os/storage/StorageManager.java
+++ b/core/java/android/os/storage/StorageManager.java
@@ -1660,6 +1660,15 @@ public class StorageManager {
@@ -1714,6 +1714,15 @@ public class StorageManager {
return false;
}
@@ -31,10 +31,19 @@ index 80dd48825ba7..cb4769ff4ec3 100644
/** {@hide}
* Is this device encrypted?
* <p>
@@ -1693,6 +1702,54 @@ public class StorageManager {
return isFileEncrypted();
@@ -1738,6 +1747,71 @@ public class StorageManager {
return RoSystemProperties.CRYPTO_FILE_ENCRYPTED;
}
+ /** {@hide}
+ * @deprecated Use {@link #isFileEncrypted} instead, since emulated FBE is no longer supported.
+ */
+ @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
+ @Deprecated
+ public static boolean isFileEncryptedNativeOnly() {
+ return false;
+ }
+
+ /** {@hide}
+ * Is this device block encrypted?
+ * @return true for block encrypted. (Implies isEncrypted() == true)
@@ -83,9 +92,17 @@ index 80dd48825ba7..cb4769ff4ec3 100644
+ return false;
+ }
+
/** {@hide}
* @deprecated Use {@link #isFileEncrypted} instead, since emulated FBE is no longer supported.
*/
+ /** {@hide}
+ * @deprecated Use {@link #isFileEncrypted} instead, since emulated FBE is no longer supported.
+ */
+ @Deprecated
+ public static boolean isFileEncryptedNativeOrEmulated() {
+ return false;
+ }
+
/** {@hide} */
public static boolean hasAdoptable() {
switch (SystemProperties.get(PROP_ADOPTABLE)) {
diff --git a/core/java/com/android/internal/os/RoSystemProperties.java b/core/java/com/android/internal/os/RoSystemProperties.java
index 40d5c4761dff..66288706b0f1 100644
--- a/core/java/com/android/internal/os/RoSystemProperties.java

6
patches_treble/frameworks_base/0004-Restore-getSimStateForSlotIndex-in-SubscriptionManag.patch
View File

@@ -1,4 +1,4 @@
From aaf44460fbf5dcdbb844e4c5bba99b48576e59ef Mon Sep 17 00:00:00 2001
From fa3c64ce2e193ccb61517284d66f78cc3d6db13e Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Wed, 2 Aug 2023 20:59:53 +0800
Subject: [PATCH 4/5] Restore getSimStateForSlotIndex in SubscriptionManager
@@ -11,10 +11,10 @@ Change-Id: I41bac57c68055f369232359a464642daab94403b
1 file changed, 14 insertions(+)
diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java
index 64e43568e4d6..cfb4f12815a2 100644
index 326b6f5af613..b994888362b0 100644
--- a/telephony/java/android/telephony/SubscriptionManager.java
+++ b/telephony/java/android/telephony/SubscriptionManager.java
@@ -2549,6 +2549,20 @@ public class SubscriptionManager {
@@ -2693,6 +2693,20 @@ public class SubscriptionManager {
return TelephonyManager.getDefault().isNetworkRoaming(subId);
}

20
patches_treble/frameworks_base/0005-Restore-getPhysicalDisplayIds-in-SurfaceControl.patch
View File

@@ -1,4 +1,4 @@
From d9dd8793634f892d905e46d45e190f72f8761def Mon Sep 17 00:00:00 2001
From 7dbc3c83213b1dacce2eaa90835721b13f504781 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sun, 19 Nov 2023 23:07:03 +0800
Subject: [PATCH 5/5] Restore getPhysicalDisplayIds in SurfaceControl
@@ -15,10 +15,10 @@ Change-Id: Ie056ecaf76acbc70d73e1c26cc4542088fcda18d
2 files changed, 26 insertions(+)
diff --git a/core/java/android/view/SurfaceControl.java b/core/java/android/view/SurfaceControl.java
index c11f4975149d..cf9262aafb03 100644
index cbbe7856178d..253eb492bd8b 100644
--- a/core/java/android/view/SurfaceControl.java
+++ b/core/java/android/view/SurfaceControl.java
@@ -179,6 +179,7 @@ public final class SurfaceControl implements Parcelable {
@@ -181,6 +181,7 @@ public final class SurfaceControl implements Parcelable {
private static native boolean nativeClearAnimationFrameStats();
private static native boolean nativeGetAnimationFrameStats(WindowAnimationFrameStats outStats);
@@ -26,7 +26,7 @@ index c11f4975149d..cf9262aafb03 100644
private static native void nativeSetDisplaySurface(long transactionObj,
IBinder displayToken, long nativeSurfaceObject);
private static native void nativeSetDisplayLayerStack(long transactionObj,
@@ -2402,6 +2403,13 @@ public final class SurfaceControl implements Parcelable {
@@ -2440,6 +2441,13 @@ public final class SurfaceControl implements Parcelable {
IVirtualDisplayCallback.Stub.asInterface(displayToken));
}
@@ -41,7 +41,7 @@ index c11f4975149d..cf9262aafb03 100644
* Returns whether protected content is supported in GPU composition.
* @hide
diff --git a/core/jni/android_view_SurfaceControl.cpp b/core/jni/android_view_SurfaceControl.cpp
index 424925328dfd..2ebd6bec0b18 100644
index db42246ca76c..0be04bb380d8 100644
--- a/core/jni/android_view_SurfaceControl.cpp
+++ b/core/jni/android_view_SurfaceControl.cpp
@@ -36,6 +36,7 @@
@@ -52,7 +52,7 @@ index 424925328dfd..2ebd6bec0b18 100644
#include <nativehelper/ScopedUtfChars.h>
#include <private/gui/ComposerService.h>
#include <stdio.h>
@@ -985,6 +986,21 @@ static void nativeSetDestinationFrame(JNIEnv* env, jclass clazz, jlong transacti
@@ -1010,6 +1011,21 @@ static void nativeSetDestinationFrame(JNIEnv* env, jclass clazz, jlong transacti
transaction->setDestinationFrame(ctrl, crop);
}
@@ -74,10 +74,10 @@ index 424925328dfd..2ebd6bec0b18 100644
static jobject nativeGetDisplayedContentSamplingAttributes(JNIEnv* env, jclass clazz,
jobject tokenObj) {
sp<IBinder> token(ibinderForJavaObject(env, tokenObj));
@@ -2133,6 +2149,8 @@ static const JNINativeMethod sSurfaceControlMethods[] = {
(void*)nativeSetFrameRate },
{"nativeSetDefaultFrameRateCompatibility", "(JJI)V",
(void*)nativeSetDefaultFrameRateCompatibility},
@@ -2187,6 +2203,8 @@ static const JNINativeMethod sSurfaceControlMethods[] = {
(void*)nativeSetFrameRateCategory},
{"nativeSetFrameRateSelectionStrategy", "(JJI)V",
(void*)nativeSetFrameRateSelectionStrategy},
+ {"nativeGetPhysicalDisplayIds", "()[J",
+ (void*)nativeGetPhysicalDisplayIds },
{"nativeSetDisplaySurface", "(JLandroid/os/IBinder;J)V",