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

Commit aacae491 authored by Anton Ivanov's avatar Anton Ivanov Committed by Android (Google) Code Review
Browse files

Merge "Fix some clang warnings in SurfaceFlinger.{h, cpp}" into main

parents 978e6f32 2417b9f0

services/surfaceflinger/SurfaceFlinger.cpp

+2 −3
Original line number Original line Diff line number Diff line
@@ -7907,8 +7907,7 @@ status_t SurfaceFlinger::applyRefreshRateSelectorPolicy( 
    const scheduler::RefreshRateSelector::Policy currentPolicy = selector.getCurrentPolicy();

    const scheduler::RefreshRateSelector::Policy currentPolicy = selector.getCurrentPolicy();

    ALOGV("Setting desired display mode specs: %s", currentPolicy.toString().c_str());

    ALOGV("Setting desired display mode specs: %s", currentPolicy.toString().c_str());





    if (const bool isPacesetter =

    if (mScheduler->onDisplayModeChanged(displayId, selector.getActiveMode(),

                mScheduler->onDisplayModeChanged(displayId, selector.getActiveMode(),

                                         /*clearContentRequirements*/ true)) {

                                         /*clearContentRequirements*/ true)) {

        mDisplayModeController.updateKernelIdleTimer(displayId);

        mDisplayModeController.updateKernelIdleTimer(displayId);

    }

    }

services/surfaceflinger/SurfaceFlinger.h

+0 −4
Original line number Original line Diff line number Diff line
@@ -70,7 +70,6 @@ 




#include <common/FlagManager.h>

#include <common/FlagManager.h>

#include "ActivePictureTracker.h"

#include "ActivePictureTracker.h"

#include "BackgroundExecutor.h"

#include "Display/DisplayModeController.h"

#include "Display/DisplayModeController.h"

#include "Display/PhysicalDisplay.h"

#include "Display/PhysicalDisplay.h"

#include "Display/VirtualDisplaySnapshot.h"

#include "Display/VirtualDisplaySnapshot.h"
@@ -102,12 +101,9 @@ 
#include <atomic>

#include <atomic>

#include <cstdint>

#include <cstdint>

#include <functional>

#include <functional>

#include <map>

#include <memory>

#include <memory>

#include <mutex>

#include <mutex>

#include <optional>

#include <optional>

#include <queue>

#include <set>

#include <string>

#include <string>

#include <thread>

#include <thread>

#include <type_traits>

#include <type_traits>