Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 67f65df0 authored by Alistair Strachan's avatar Alistair Strachan Committed by android-build-merger
Browse files

Fix getDisplayInfo() for SurfaceFlinger in HWC2 mode. am: c175253b am: d8449e55

am: 45c28e4a

Change-Id: I663702bd8a4744e3d7fb0cd349178d6838221ddd
parents ab6f49f2 45c28e4a
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@
#include <unordered_map>
#include <unordered_set>
#include <vector>
#include <map>

namespace android {
    class Fence;
@@ -283,7 +284,9 @@ private:
    bool mIsConnected;
    DisplayType mType;
    std::unordered_map<hwc2_layer_t, std::weak_ptr<Layer>> mLayers;
    std::unordered_map<hwc2_config_t, std::shared_ptr<const Config>> mConfigs;
    // The ordering in this map matters, for getConfigs(), when it is
    // converted to a vector
    std::map<hwc2_config_t, std::shared_ptr<const Config>> mConfigs;
};

// Convenience C++ class to access hwc2_device_t Layer functions directly.