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

Commit 635c2dec authored by Michael Hoisie's avatar Michael Hoisie Committed by Automerger Merge Worker
Browse files

Merge "Update libgui to use android::base properties instead of cutils" into rvc-dev am: 49497c9a 

Change-Id: I451eb499616aecc6e9a173e922eb8e3b95836060
parents 872667dd 49497c9a

libs/gui/BLASTBufferQueue.cpp

+0 −2
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ 


#define ATRACE_TAG ATRACE_TAG_GRAPHICS



#include <cutils/properties.h>



#include <gui/BLASTBufferQueue.h>

#include <gui/BufferItemConsumer.h>

#include <gui/GLConsumer.h>

libs/gui/BufferQueueCore.cpp

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 


#include <inttypes.h>



#include <cutils/properties.h>

#include <cutils/atomic.h>



#include <gui/BufferItem.h>

libs/gui/DebugEGLImageTracker.cpp

+3 −5
Original line number Diff line number Diff line
@@ -14,13 +14,14 @@ 
 * limitations under the License.

 */



#include <android-base/properties.h>

#include <android-base/stringprintf.h>

#include <cutils/properties.h>

#include <gui/DebugEGLImageTracker.h>



#include <cinttypes>

#include <unordered_map>



using android::base::GetBoolProperty;

using android::base::StringAppendF;



std::mutex DebugEGLImageTracker::mInstanceLock;
@@ -57,10 +58,7 @@ private: 
DebugEGLImageTracker *DebugEGLImageTracker::getInstance() {

    std::lock_guard lock(mInstanceLock);

    if (mInstance == nullptr) {

        char value[PROPERTY_VALUE_MAX];

        property_get("debug.sf.enable_egl_image_tracker", value, "0");

        const bool enabled = static_cast<bool>(atoi(value));



        const bool enabled = GetBoolProperty("debug.sf.enable_egl_image_tracker", false);

        if (enabled) {

            mInstance = new DebugEGLImageTrackerImpl();

        } else {

libs/gui/tests/Surface_test.cpp

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
#include <android/hardware/configstore/1.0/ISurfaceFlingerConfigs.h>

#include <binder/ProcessState.h>

#include <configstore/Utils.h>

#include <cutils/properties.h>

#include <gui/BufferItemConsumer.h>

#include <gui/IDisplayEventConnection.h>

#include <gui/IProducerListener.h>