Regenerate patches

frameworks/base got too messy, time to clean it up
This commit is contained in:
Andy CrossGate Yan
2021-02-14 10:41:04 +00:00
parent 85c08ba1de
commit 79b5b414a7
150 changed files with 615 additions and 881 deletions
@@ -1,7 +1,7 @@
From 0ce8e40182af9c1955a862f8bba608b90e6a0524 Mon Sep 17 00:00:00 2001
From 0b98498b3b9768fabd4b9a45e6ce23c6bcbc93a1 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Tue, 14 Aug 2018 21:01:35 +0200
Subject: [PATCH 1/5] AOSP 8.0/8.1 didn't use presentOrValidate, so it's
Subject: [PATCH 1/8] AOSP 8.0/8.1 didn't use presentOrValidate, so it's
broken. Don't use it
Change-Id: If86793dba3738680280f9dc0f7e7c802c0836690
@@ -23,5 +23,5 @@ index 1099041b4..2021c26b0 100644
uint32_t state = UINT32_MAX;
error = hwcDisplay->presentOrValidate(&numTypes, &numRequests, &outPresentFence , &state);
--
2.17.1
2.25.1
@@ -1,7 +1,7 @@
From d51e5d5a041f8404b5d62cfca5f5765588ded4fb Mon Sep 17 00:00:00 2001
From f4a49874650b6192a821a6e755f600745b34210a Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sun, 19 Aug 2018 23:07:24 +0200
Subject: [PATCH 2/5] Ignore usage bits verification
Subject: [PATCH 2/8] Ignore usage bits verification
This didn't ignore as of 8.1, so we're ""safe""
@@ -11,10 +11,10 @@ Change-Id: I40c1d588c1fa104d844322b469f76e52bee1495a
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libs/ui/Gralloc2.cpp b/libs/ui/Gralloc2.cpp
index 5dc453005..90dc90f39 100644
index 2dd11b141..3ebf9808d 100644
--- a/libs/ui/Gralloc2.cpp
+++ b/libs/ui/Gralloc2.cpp
@@ -108,7 +108,7 @@ status_t Gralloc2Mapper::validateBufferDescriptorInfo(
@@ -115,7 +115,7 @@ status_t Gralloc2Mapper::validateBufferDescriptorInfo(
if (descriptorInfo->usage & ~validUsageBits) {
ALOGE("buffer descriptor contains invalid usage bits 0x%" PRIx64,
descriptorInfo->usage & ~validUsageBits);
@@ -24,5 +24,5 @@ index 5dc453005..90dc90f39 100644
return NO_ERROR;
}
--
2.17.1
2.25.1
@@ -1,7 +1,7 @@
From 8db7e963f05ebc59298cf8e9b74f98d670ec5742 Mon Sep 17 00:00:00 2001
From 66d21d061b9c9f745c5cb199c29268f519425d71 Mon Sep 17 00:00:00 2001
From: phh <phh@phh.me>
Date: Wed, 22 Aug 2018 08:57:52 +0000
Subject: [PATCH 3/5] Enable fallback to old ro.sf.hwrotation property
Subject: [PATCH 3/8] Enable fallback to old ro.sf.hwrotation property
Change-Id: I46b75a15b85fc5bda31357a4beeb7dab77bd6fe1
---
@@ -9,10 +9,10 @@ Change-Id: I46b75a15b85fc5bda31357a4beeb7dab77bd6fe1
1 file changed, 18 insertions(+)
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 6166789fc..14ca4729c 100644
index e2ba4de6d..d66c8a8f5 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -329,7 +329,25 @@ SurfaceFlinger::SurfaceFlinger(Factory& factory) : SurfaceFlinger(factory, SkipI
@@ -339,7 +339,25 @@ SurfaceFlinger::SurfaceFlinger(Factory& factory) : SurfaceFlinger(factory, SkipI
SurfaceFlinger::primaryDisplayOrientation = DisplayState::eOrientationDefault;
break;
}
@@ -39,5 +39,5 @@ index 6166789fc..14ca4729c 100644
mInternalDisplayPrimaries = sysprop::getDisplayNativePrimaries();
--
2.17.1
2.25.1
@@ -1,7 +1,7 @@
From c554242731125a5e6a3f7d31d4f4af9049d8c7f4 Mon Sep 17 00:00:00 2001
From 1a0eb93d4e59e5857cd0afd3560647258955c6ed Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 12 Aug 2019 23:48:37 +0200
Subject: [PATCH 4/5] Some Samsung devices requires lying colorspace
Subject: [PATCH 4/8] Some Samsung devices requires lying colorspace
Change-Id: I4153b8e7abc10c519565e4e4386c6388621477b2
---
@@ -9,10 +9,10 @@ Change-Id: I4153b8e7abc10c519565e4e4386c6388621477b2
1 file changed, 6 insertions(+)
diff --git a/opengl/libs/EGL/egl_platform_entries.cpp b/opengl/libs/EGL/egl_platform_entries.cpp
index e996be685..57ca592a7 100644
index a3bb6debe..bfa4a9bb2 100644
--- a/opengl/libs/EGL/egl_platform_entries.cpp
+++ b/opengl/libs/EGL/egl_platform_entries.cpp
@@ -458,8 +458,14 @@ EGLBoolean eglGetConfigAttribImpl(EGLDisplay dpy, EGLConfig config,
@@ -459,8 +459,14 @@ EGLBoolean eglGetConfigAttribImpl(EGLDisplay dpy, EGLConfig config,
// ----------------------------------------------------------------------------
// Translates EGL color spaces to Android data spaces.
@@ -28,5 +28,5 @@ index e996be685..57ca592a7 100644
} else if (colorspace == EGL_GL_COLORSPACE_SRGB_KHR) {
return HAL_DATASPACE_V0_SRGB;
--
2.17.1
2.25.1
@@ -1,7 +1,7 @@
From fd7365352954e1ab647fca2eefeaa2707d47f7fa Mon Sep 17 00:00:00 2001
From c1f0158346aace39261b787854e10d58e9d905fe Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Wed, 14 Aug 2019 23:37:10 +0200
Subject: [PATCH 5/5] On Samsung, we need to send a hack-message to HAL to get
Subject: [PATCH 5/8] On Samsung, we need to send a hack-message to HAL to get
all Sensors
Change-Id: Id6a1fa48340de61c418493668e9abd22c2599376
@@ -33,5 +33,5 @@ index 717f31769..45d6c679b 100644
[&](const auto &list) {
const size_t count = list.size();
--
2.17.1
2.25.1
@@ -1,7 +1,7 @@
From 723d8f84e0376b97840fa5e287a994823f6f5be4 Mon Sep 17 00:00:00 2001
From a92fa788759b5b4550bf4d2778077af78dbc3af7 Mon Sep 17 00:00:00 2001
From: Pierre Couillaud <pierre.couillaud@broadcom.com>
Date: Tue, 27 Aug 2019 13:43:22 -0700
Subject: [PATCH 6/6] SurfaceFlinger: retain the sideband layer information for
Subject: [PATCH 6/8] SurfaceFlinger: retain the sideband layer information for
composition
when present, the sideband layer stream information is not saved into
@@ -72,7 +72,7 @@ Signed-off-by: Pierre Couillaud <pierre.couillaud@broadcom.com>
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/services/surfaceflinger/BufferQueueLayer.cpp b/services/surfaceflinger/BufferQueueLayer.cpp
index f35a4fd49..cbb9d658e 100644
index eb1bf66cd..af5fe6246 100644
--- a/services/surfaceflinger/BufferQueueLayer.cpp
+++ b/services/surfaceflinger/BufferQueueLayer.cpp
@@ -243,8 +243,9 @@ bool BufferQueueLayer::latchSidebandStream(bool& recomputeVisibleRegions) {
@@ -87,5 +87,5 @@ index f35a4fd49..cbb9d658e 100644
setTransactionFlags(eTransactionNeeded);
mFlinger->setTransactionFlags(eTraversalNeeded);
--
2.17.1
2.25.1
@@ -1,7 +1,7 @@
From c982ade7da4d434e0a779b003e6bfcc6141232b6 Mon Sep 17 00:00:00 2001
From 46a9476a66d10d574724ee37aa87c80cf90d1cdc Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Tue, 10 Mar 2020 23:26:55 +0100
Subject: [PATCH 7/7] Use BKK's hwcomposer hacks to properly display FOD layers
Subject: [PATCH 7/8] Use BKK's hwcomposer hacks to properly display FOD layers
Insecure hack: Set FOD layers to magical Z values to trigger
OPPO/Realme/Oneplus' whole blitter behaviours:
@@ -36,5 +36,5 @@ index 5ce72b087..23b29d6fd 100644
to_string(error).c_str(), static_cast<int32_t>(error));
}
--
2.17.1
2.25.1
@@ -1,4 +1,4 @@
From 8502ea88bf1ac84ceaa6495c6831a55c733212ad Mon Sep 17 00:00:00 2001
From 3da16d65f8c84a4d4d29ad2ea351d9cb48fe3110 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Wed, 20 May 2020 21:16:56 +0200
Subject: [PATCH 8/8] Samsung + Xiaomi new FOD HBM controls
@@ -121,5 +121,5 @@ index 23b29d6fd..0d7c9897a 100644
if (auto error = hwcLayer->setZOrder(z); error != HWC2::Error::None) {
--
2.17.1
2.25.1