patches: native: Remove conflicted patches
Signed-off-by: Jackeagle <jackeagle102@gmail.com>
Change-Id: I501b5bd20a78bd51099864a3073b796b62e0fdb6
diff --git a/patches/frameworks/native/0003-Revert-sf-Fix-damage-for-Huawei-compositor.patch b/patches/frameworks/native/0003-Revert-sf-Fix-damage-for-Huawei-compositor.patch
deleted file mode 100644
index 7b44a7e..0000000
--- a/patches/frameworks/native/0003-Revert-sf-Fix-damage-for-Huawei-compositor.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 090a7ac43a4ee42a092580a4339d51e66e0cab7a Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Sat, 25 Aug 2018 02:13:29 -0400
-Subject: [PATCH 3/4] Revert "sf: Fix damage for Huawei compositor"
-
-This reverts commit 508eeaea266bc018bf1265f789ed858b73dd7079.
----
- services/surfaceflinger/BufferLayer.cpp | 35 +---------------------
- services/surfaceflinger/SurfaceFlinger.cpp | 8 -----
- services/surfaceflinger/SurfaceFlinger.h | 2 --
- 3 files changed, 1 insertion(+), 44 deletions(-)
-
-diff --git a/services/surfaceflinger/BufferLayer.cpp b/services/surfaceflinger/BufferLayer.cpp
-index 264d35aed..7ac143219 100644
---- a/services/surfaceflinger/BufferLayer.cpp
-+++ b/services/surfaceflinger/BufferLayer.cpp
-@@ -631,40 +631,7 @@ void BufferLayer::setPerFrameData(const sp<const DisplayDevice>& displayDevice)
- visible.dump(LOG_TAG);
- }
-
-- if(mFlinger->mDamageUsesScreenReference) {
-- const Rect& frame = hwcInfo.displayFrame;
-- int32_t left = frame.left;
-- int32_t top = frame.top;
-- int32_t right = frame.right;
-- int32_t bottom = frame.bottom;
-- if(surfaceDamageRegion.getBounds() == Rect::INVALID_RECT) {
-- auto fullSource = Region(Rect(left, top, right, bottom));
-- error = hwcLayer->setSurfaceDamage(fullSource);
-- } else {
-- //There is no easy way to scale, so just scale the bounds
-- const Rect& preDamageRect = surfaceDamageRegion.bounds();
-- const FloatRect& crop = hwcInfo.sourceCrop;
--
-- float frameWidth = right - left;
-- float frameHeight = bottom - top;
--
-- float cropWidth = crop.right - crop.left;
-- float cropHeight = crop.bottom - crop.top;
--
-- float wFactor = frameWidth / cropWidth;
-- float hFactor = frameHeight / cropHeight;
--
-- Rect scaledDamageRect = Rect(
-- (int)(preDamageRect.left * wFactor),
-- (int)(preDamageRect.top * hFactor),
-- (int)(preDamageRect.right * wFactor),
-- (int)(preDamageRect.bottom * hFactor));
-- Region realDamage = Region(scaledDamageRect).translate(frame.left, frame.top);
-- error = hwcLayer->setSurfaceDamage(realDamage);
-- }
-- } else {
-- error = hwcLayer->setSurfaceDamage(surfaceDamageRegion);
-- }
-+ error = hwcLayer->setSurfaceDamage(surfaceDamageRegion);
- if (error != HWC2::Error::None) {
- ALOGE("[%s] Failed to set surface damage: %s (%d)", mName.string(),
- to_string(error).c_str(), static_cast<int32_t>(error));
-diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
-index cb3fa9ec1..0580b4bfc 100644
---- a/services/surfaceflinger/SurfaceFlinger.cpp
-+++ b/services/surfaceflinger/SurfaceFlinger.cpp
-@@ -384,14 +384,6 @@ SurfaceFlinger::SurfaceFlinger() : SurfaceFlinger(SkipInitialization) {
- // for production purposes later on.
- setenv("TREBLE_TESTING_OVERRIDE", "true", true);
- }
--
-- property_get("ro.hardware", value, "");
-- if (!strcmp(value, "hi3660") ||
-- !strcmp(value, "hi6250") ||
-- !strcmp(value, "hi3670") ||
-- !strcmp(value, "kirin970")) {
-- mDamageUsesScreenReference = true;
-- }
- }
-
- void SurfaceFlinger::onFirstRef()
-diff --git a/services/surfaceflinger/SurfaceFlinger.h b/services/surfaceflinger/SurfaceFlinger.h
-index 7a8762b83..0148ab675 100644
---- a/services/surfaceflinger/SurfaceFlinger.h
-+++ b/services/surfaceflinger/SurfaceFlinger.h
-@@ -852,8 +852,6 @@ private:
- // Restrict layers to use two buffers in their bufferqueues.
- bool mLayerTripleBufferingDisabled = false;
-
-- bool mDamageUsesScreenReference;
--
- // these are thread safe
- mutable std::unique_ptr<MessageQueue> mEventQueue{std::make_unique<impl::MessageQueue>()};
- FrameTracker mAnimFrameTracker;
---
-2.17.1
-
diff --git a/patches/frameworks/native/0004-device-Huawei-HWC-doesn-t-understand-0-0-0-0-fullscr.patch b/patches/frameworks/native/0004-device-Huawei-HWC-doesn-t-understand-0-0-0-0-fullscr.patch
deleted file mode 100644
index 0002bec..0000000
--- a/patches/frameworks/native/0004-device-Huawei-HWC-doesn-t-understand-0-0-0-0-fullscr.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 8ee3c4eba65c42f02c13d5bb65dcce33e9c0260a Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Fri, 5 Jan 2018 00:26:38 +0100
-Subject: [PATCH 4/4] [device] ::Huawei:: HWC doesn't understand 0,0,0,0 ==
- fullscreen damage. Set it to the whole visible surface
-
-::Huawei:: Fix damage for Huawei compositor
-
-For Huawei compositor, the damage area is a region on the screen.
-But for SurfaceFlinger, this is a region on the source surface.
-On Huawei devices, do the plane conversion.
-
-This fixes several UI glitches, most notably GBoard.
----
- services/surfaceflinger/BufferLayer.cpp | 8 +++++++-
- services/surfaceflinger/SurfaceFlinger.cpp | 8 ++++++++
- services/surfaceflinger/SurfaceFlinger.h | 3 +++
- 3 files changed, 18 insertions(+), 1 deletion(-)
-
-diff --git a/services/surfaceflinger/BufferLayer.cpp b/services/surfaceflinger/BufferLayer.cpp
-index 7ac143219..2646af0c9 100644
---- a/services/surfaceflinger/BufferLayer.cpp
-+++ b/services/surfaceflinger/BufferLayer.cpp
-@@ -631,7 +631,13 @@ void BufferLayer::setPerFrameData(const sp<const DisplayDevice>& displayDevice)
- visible.dump(LOG_TAG);
- }
-
-- error = hwcLayer->setSurfaceDamage(surfaceDamageRegion);
-+ if(mFlinger->mDamageUsesScreenReference) {
-+ const auto& frame = hwcInfo.displayFrame;
-+ auto fullSource = Region(Rect(frame.left, frame.top, frame.right, frame.bottom));
-+ error = hwcLayer->setSurfaceDamage(fullSource);
-+ } else {
-+ error = hwcLayer->setSurfaceDamage(surfaceDamageRegion);
-+ }
- if (error != HWC2::Error::None) {
- ALOGE("[%s] Failed to set surface damage: %s (%d)", mName.string(),
- to_string(error).c_str(), static_cast<int32_t>(error));
-diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
-index 0580b4bfc..49e3b269a 100644
---- a/services/surfaceflinger/SurfaceFlinger.cpp
-+++ b/services/surfaceflinger/SurfaceFlinger.cpp
-@@ -384,6 +384,14 @@ SurfaceFlinger::SurfaceFlinger() : SurfaceFlinger(SkipInitialization) {
- // for production purposes later on.
- setenv("TREBLE_TESTING_OVERRIDE", "true", true);
- }
-+
-+ property_get("ro.hardware", value, "");
-+ if(strstr(value, "hi3660")||
-+ strstr(value, "hi6250") ||
-+ strstr(value, "hi3670") ||
-+ strstr(value, "kirin970")) {
-+ mDamageUsesScreenReference = true;
-+ }
- }
-
- void SurfaceFlinger::onFirstRef()
-diff --git a/services/surfaceflinger/SurfaceFlinger.h b/services/surfaceflinger/SurfaceFlinger.h
-index 0148ab675..367ea555a 100644
---- a/services/surfaceflinger/SurfaceFlinger.h
-+++ b/services/surfaceflinger/SurfaceFlinger.h
-@@ -852,6 +852,9 @@ private:
- // Restrict layers to use two buffers in their bufferqueues.
- bool mLayerTripleBufferingDisabled = false;
-
-+ bool mDamageUsesScreenReference;
-+
-+
- // these are thread safe
- mutable std::unique_ptr<MessageQueue> mEventQueue{std::make_unique<impl::MessageQueue>()};
- FrameTracker mAnimFrameTracker;
---
-2.17.1
-