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

Commit 8d95f085 authored by Rachel Lee's avatar Rachel Lee Committed by Android (Google) Code Review
Browse files

Merge changes I9631fc94,I7e7ade6a 

* changes:
  Enable -Wconversion for RenderArea.
  Enable -Wconversion for Client.
parents 8650d5f4 c7761eee

services/surfaceflinger/Client.cpp

+0 −7
Original line number Diff line number Diff line
@@ -14,10 +14,6 @@ 
 * limitations under the License.

 */



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

#pragma clang diagnostic push

#pragma clang diagnostic ignored "-Wconversion"



#include <stdint.h>

#include <sys/types.h>
@@ -132,6 +128,3 @@ status_t Client::getLayerFrameStats(const sp<IBinder>& handle, FrameStats* outSt 


// ---------------------------------------------------------------------------

}; // namespace android
 


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

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

services/surfaceflinger/RenderArea.cpp

+0 −7
Original line number Diff line number Diff line
@@ -14,10 +14,6 @@ 
 * limitations under the License.

 */



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

#pragma clang diagnostic push

#pragma clang diagnostic ignored "-Wconversion"



#include "RenderArea.h"



namespace android {
@@ -33,6 +29,3 @@ float RenderArea::getCaptureFillValue(CaptureFill captureFill) { 
}



} // namespace android
 


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

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