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

Commit 1e3cef8b authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 13770794 from 27d3859c to 25Q4-release

Change-Id: I035509d3934aedc274d50a172151f985e4e4ec20
parents 5ad1ae77 27d3859c
Loading
Loading
Loading
Loading
+13 −1
Original line number Diff line number Diff line
@@ -72,6 +72,16 @@ namespace android {

using namespace std::chrono_literals;

namespace {
    bool waitForFrozenListenerRemovalCompletion() {
#if defined(LIBBINDER_DEFER_BC_REQUEST_FREEZE_NOTIFICATION)
        return true;
#else
        return false;
#endif
    }
}

// Static const and functions will be optimized out if not used,
// when LOG_NDEBUG and references in IF_LOG_COMMANDS() are optimized out.
static const char* kReturnStrings[] = {
@@ -1628,7 +1638,9 @@ status_t IPCThreadState::executeCommand(int32_t cmd)
   case BR_CLEAR_FREEZE_NOTIFICATION_DONE:
        {
            BpBinder* proxy = (BpBinder*)mIn.readPointer();
            if (waitForFrozenListenerRemovalCompletion()) {
                proxy->getPrivateAccessor().onFrozenStateChangeListenerRemoved();
            }
            proxy->getWeakRefs()->decWeak(proxy);
        }
        break;
+1 −1
Original line number Diff line number Diff line
@@ -55,8 +55,8 @@ FramebufferSurface::FramebufferSurface(HWComposer& hwc, PhysicalDisplayId displa
                                       const ui::Size& size, const ui::Size& maxSize)
      : ConsumerBase(producer, consumer),
        mDisplayId(displayId),
        mLimitedSize(limitSize(size)),
        mMaxSize(maxSize),
        mLimitedSize(limitSize(size)),
        mCurrentBufferSlot(-1),
        mCurrentBuffer(),
        mCurrentFence(Fence::NO_FENCE),
+8 −7
Original line number Diff line number Diff line
@@ -39,11 +39,6 @@ class HWComposer;

class FramebufferSurface : public ConsumerBase, public compositionengine::DisplaySurface {
public:
    FramebufferSurface(HWComposer& hwc, PhysicalDisplayId displayId,
                       const sp<IGraphicBufferProducer>& producer,
                       const sp<IGraphicBufferConsumer>& consumer, const ui::Size& size,
                       const ui::Size& maxSize);

    virtual status_t beginFrame(bool mustRecompose);
    virtual status_t prepareFrame(CompositionType compositionType);
    virtual status_t advanceFrame(float hdrSdrRatio);
@@ -58,6 +53,12 @@ public:

private:
    friend class FramebufferSurfaceTest;
    friend class sp<FramebufferSurface>;

    FramebufferSurface(HWComposer& hwc, PhysicalDisplayId displayId,
                       const sp<IGraphicBufferProducer>& producer,
                       const sp<IGraphicBufferConsumer>& consumer, const ui::Size& size,
                       const ui::Size& maxSize);

    void initializeConsumer();

@@ -75,12 +76,12 @@ private:

    const PhysicalDisplayId mDisplayId;

    const ui::Size mLimitedSize;

    // Framebuffer size has a dimension limitation in pixels based on the graphics capabilities of
    // the device.
    const ui::Size mMaxSize;

    const ui::Size mLimitedSize;

    // mCurrentBufferIndex is the slot index of the current buffer or
    // INVALID_BUFFER_SLOT to indicate that either there is no current buffer
    // or the buffer is not associated with a slot.
+0 −2
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ huisinro@google.com
jreck@google.com
jshargo@google.com
lpique@google.com
mattbuckley@google.com
melodymhsu@google.com
pdwilliams@google.com
racarr@google.com
@@ -16,4 +15,3 @@ ramindani@google.com
rnlee@google.com
sallyqi@google.com
vishnun@google.com
xwxw@google.com
+1 −4
Original line number Diff line number Diff line
@@ -3727,9 +3727,6 @@ std::pair<DisplayModes, DisplayModePtr> SurfaceFlinger::loadDisplayModes(
    DisplayModes newModes;
    for (const auto& hwcMode : hwcModes) {
        const auto id = nextModeId++;
        OutputType hdrOutputType = FlagManager::getInstance().connected_display_hdr()
                ? hwcMode.hdrOutputType
                : OutputType::INVALID;
        newModes.try_emplace(id,
                             DisplayMode::Builder(hwcMode.hwcId)
                                     .setId(id)
@@ -3740,7 +3737,7 @@ std::pair<DisplayModes, DisplayModePtr> SurfaceFlinger::loadDisplayModes(
                                     .setDpiX(hwcMode.dpiX)
                                     .setDpiY(hwcMode.dpiY)
                                     .setGroup(hwcMode.configGroup)
                                     .setHdrOutputType(hdrOutputType)
                                     .setHdrOutputType(hwcMode.hdrOutputType)
                                     .build());
    }

Loading