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

Commit 12e5c366 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Change to using sysprop for libgui_tests" into rvc-dev am: 03187779 am: fc28cca9 

Change-Id: I9b7a29d322e14135b59d07b0b492d19e9beb20a7
parents 5c2a1eaf fc28cca9

libs/gui/tests/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ cc_test { 
    shared_libs: [

        "android.hardware.configstore@1.0",

        "android.hardware.configstore-utils",

        "libSurfaceFlingerProp",

        "libbase",

        "liblog",

        "libEGL",
@@ -53,6 +54,8 @@ cc_test { 
        "libutils",

        "libnativewindow"

    ],



    header_libs: ["libsurfaceflinger_headers"],

}



// Build a separate binary to $(TARGET_OUT_DATA_NATIVE_TESTS)/$(LOCAL_MODULE)

libs/gui/tests/Surface_test.cpp

+4 −5
Original line number Diff line number Diff line
@@ -18,17 +18,18 @@ 


#include <gtest/gtest.h>



#include <SurfaceFlingerProperties.h>

#include <android/hardware/configstore/1.0/ISurfaceFlingerConfigs.h>

#include <binder/ProcessState.h>

#include <configstore/Utils.h>

#include <cutils/properties.h>

#include <inttypes.h>

#include <gui/BufferItemConsumer.h>

#include <gui/IDisplayEventConnection.h>

#include <gui/IProducerListener.h>

#include <gui/ISurfaceComposer.h>

#include <gui/Surface.h>

#include <gui/SurfaceComposerClient.h>

#include <inttypes.h>

#include <private/gui/ComposerService.h>

#include <ui/Rect.h>

#include <utils/String8.h>
@@ -46,11 +47,9 @@ using ui::ColorMode; 


using Transaction = SurfaceComposerClient::Transaction;



static bool hasWideColorDisplay =

        getBool<ISurfaceFlingerConfigs, &ISurfaceFlingerConfigs::hasWideColorDisplay>(false);

static bool hasWideColorDisplay = android::sysprop::has_wide_color_display(false);



static bool hasHdrDisplay =

        getBool<ISurfaceFlingerConfigs, &ISurfaceFlingerConfigs::hasHDRDisplay>(false);

static bool hasHdrDisplay = android::sysprop::has_HDR_display(false);



class FakeSurfaceComposer;

class FakeProducerFrameEventHistory;