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

Commit 3b5a69e1 authored by Lloyd Pique's avatar Lloyd Pique
Browse files

CE: Reduce scope of where -Wconversion is disabled 

The local conversion warning have been addressed, and the only remaining
conversion warnings are in some of the header files that are included,
directly or indirectly.

Test: Builds
Bug: 129481165
Change-Id: If6b7b9055b17ef67872bb5e34a0ef090b1e1a768
parent 0a456231

services/surfaceflinger/CompositionEngine/include/compositionengine/DisplayColorProfile.h

+7 −0
Original line number Diff line number Diff line
@@ -19,8 +19,15 @@ 
#include <cstdint>

#include <string>



// TODO(b/129481165): remove the #pragma below and fix conversion issues

#pragma clang diagnostic push

#pragma clang diagnostic ignored "-Wconversion"



#include <ui/GraphicTypes.h>



// TODO(b/129481165): remove the #pragma below and fix conversion issues

#pragma clang diagnostic pop // ignored "-Wconversion"



namespace android {



class HdrCapabilities;

services/surfaceflinger/CompositionEngine/include/compositionengine/DisplayColorProfileCreationArgs.h

+8 −0
Original line number Diff line number Diff line
@@ -20,7 +20,15 @@ 
#include <unordered_map>

#include <vector>



// TODO(b/129481165): remove the #pragma below and fix conversion issues

#pragma clang diagnostic push

#pragma clang diagnostic ignored "-Wconversion"



#include <ui/GraphicTypes.h>



// TODO(b/129481165): remove the #pragma below and fix conversion issues

#pragma clang diagnostic pop // ignored "-Wconversion"



#include <ui/HdrCapabilities.h>



namespace android::compositionengine {

services/surfaceflinger/CompositionEngine/include/compositionengine/LayerFE.h

+8 −0
Original line number Diff line number Diff line
@@ -20,7 +20,15 @@ 
#include <ostream>

#include <unordered_set>



// TODO(b/129481165): remove the #pragma below and fix conversion issues

#pragma clang diagnostic push

#pragma clang diagnostic ignored "-Wconversion"



#include <renderengine/LayerSettings.h>



// TODO(b/129481165): remove the #pragma below and fix conversion issues

#pragma clang diagnostic pop // ignored "-Wconversion"



#include <utils/RefBase.h>

#include <utils/Timers.h>

services/surfaceflinger/CompositionEngine/include/compositionengine/LayerFECompositionState.h

+11 −3
Original line number Diff line number Diff line
@@ -18,18 +18,26 @@ 


#include <cstdint>



#include <gui/BufferQueue.h>

#include <gui/HdrMetadata.h>

#include <math/mat4.h>

#include <ui/FloatRect.h>

#include <ui/GraphicBuffer.h>

#include <ui/GraphicTypes.h>

#include <ui/Rect.h>

#include <ui/Region.h>

#include <ui/Transform.h>



// TODO(b/129481165): remove the #pragma below and fix conversion issues

#pragma clang diagnostic push

#pragma clang diagnostic ignored "-Wconversion"



#include <gui/BufferQueue.h>

#include <ui/GraphicBuffer.h>

#include <ui/GraphicTypes.h>



#include "DisplayHardware/ComposerHal.h"



// TODO(b/129481165): remove the #pragma below and fix conversion issues

#pragma clang diagnostic pop // ignored "-Wconversion"



namespace android::compositionengine {



/*

services/surfaceflinger/CompositionEngine/include/compositionengine/OutputLayer.h

+7 −0
Original line number Diff line number Diff line
@@ -21,9 +21,16 @@ 


#include <utils/StrongPointer.h>



// TODO(b/129481165): remove the #pragma below and fix conversion issues

#pragma clang diagnostic push

#pragma clang diagnostic ignored "-Wconversion"



#include "DisplayHardware/ComposerHal.h"

#include "DisplayHardware/DisplayIdentification.h"



// TODO(b/129481165): remove the #pragma below and fix conversion issues

#pragma clang diagnostic pop // ignored "-Wconversion"



namespace HWC2 {

class Layer;

} // namespace HWC2