commit cee95bb6295ada529d6fa7b12cc1bbf95a5f1fe4
author Kevin DuBois <kevindubois@google.com> Fri Jun 21 10:45:17 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Jun 21 10:45:17 2019 -0700
tree 451a16cebcfb61af5645ce40fe39e39a6ff40aa6
parent 7db79db81f134093ae5989c9f389b1237baf2033
parent 93948316cbd1b8a0812f50ae116b52650e8bccf8

SF: do not extend DisplayDevice lifetime am: 769ab6f949
am: 93948316cb

Change-Id: Ice72c32f6eeee51a83793fc4284715f3f4c8f924

services/surfaceflinger/RegionSamplingThread.cpp

diff --git a/services/surfaceflinger/RegionSamplingThread.cpp b/services/surfaceflinger/RegionSamplingThread.cpp
index 8b85d4c..72bbf5d 100644
--- a/services/surfaceflinger/RegionSamplingThread.cpp
+++ b/services/surfaceflinger/RegionSamplingThread.cpp
@@ -342,9 +342,19 @@
     }
 
     const auto device = mFlinger.getDefaultDisplayDevice();
-    const auto display = device->getCompositionDisplay();
-    const auto state = display->getState();
-    const auto orientation = static_cast<ui::Transform::orientation_flags>(state.orientation);
+    const auto orientation = [](uint32_t orientation) {
+        switch (orientation) {
+            default:
+            case DisplayState::eOrientationDefault:
+                return ui::Transform::ROT_0;
+            case DisplayState::eOrientation90:
+                return ui::Transform::ROT_90;
+            case DisplayState::eOrientation180:
+                return ui::Transform::ROT_180;
+            case DisplayState::eOrientation270:
+                return ui::Transform::ROT_270;
+        }
+    }(device->getOrientation());
 
     std::vector<RegionSamplingThread::Descriptor> descriptors;
     Region sampleRegion;