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

Commit 84a507ae authored by Dan Stoza's avatar Dan Stoza Committed by Android Git Automerger
Browse files

am 13c04c27: Merge "surfaceflinger: Fix range check for getFormat" 

* commit '13c04c27':
  surfaceflinger: Fix range check for getFormat
parents 967482f6 13c04c27

services/surfaceflinger/DisplayHardware/HWComposer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -464,7 +464,7 @@ sp<Fence> HWComposer::getDisplayFence(int disp) const { 
}



uint32_t HWComposer::getFormat(int disp) const {

    if (uint32_t(disp)>31 || !mAllocatedDisplayIDs.hasBit(disp)) {

    if (static_cast<uint32_t>(disp) >= MAX_HWC_DISPLAYS || !mAllocatedDisplayIDs.hasBit(disp)) {

        return HAL_PIXEL_FORMAT_RGBA_8888;

    } else {

        return mDisplayData[disp].format;