commit 7b31cca0404670d61c6f3c686920972e5e37e64d
author Neha Jain <jainne@google.com> Mon Jan 09 23:10:42 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jan 09 23:10:52 2023 +0000
tree 9b087dbe5b7a64d498921553180949777dc98187
parent 95f919794466fffee6f41322dfc055d21e10eaf8

Revert "Clean up debug.sf.ignore_hwc_physical_display_orientation"

Revert submission 20881991-clean-up-temp-sysprop

Reason for revert: b/264735287

Reverted changes: /q/submissionid:20881991-clean-up-temp-sysprop

Change-Id: I26b51519ef8b7f15a56577fe44e5ed6bba2e75e7

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index f6880ce..4d93e7e 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -422,6 +422,9 @@
     property_get("debug.sf.treat_170m_as_sRGB", value, "0");
     mTreat170mAsSrgb = atoi(value);
 
+    mIgnoreHwcPhysicalDisplayOrientation =
+            base::GetBoolProperty("debug.sf.ignore_hwc_physical_display_orientation"s, false);
+
     // We should be reading 'persist.sys.sf.color_saturation' here
     // but since /data may be encrypted, we need to wait until after vold
     // comes online to attempt to read the property. The property is
@@ -2401,7 +2404,8 @@
     if (!id) {
         return ui::ROTATION_0;
     }
-    if (getHwComposer().getComposer()->isSupported(
+    if (!mIgnoreHwcPhysicalDisplayOrientation &&
+        getHwComposer().getComposer()->isSupported(
                 Hwc2::Composer::OptionalFeature::PhysicalDisplayOrientation)) {
         switch (getHwComposer().getPhysicalDisplayOrientation(*id)) {
             case Hwc2::AidlTransform::ROT_90: