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

Commit d68ecff7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Avoid TREBLE_TESTING_OVERRIDE" am: 88fdc661 am: 1e59efe2 am: d6a1f122 am: f7adb9a9 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1357927

Change-Id: I7c5200788f409316c1c0f82fdcae3d118f1efa52
parents b46878b9 f7adb9a9

services/surfaceflinger/SurfaceFlinger.cpp

+2 −1
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ 
#include <gui/LayerMetadata.h>

#include <gui/LayerState.h>

#include <gui/Surface.h>

#include <hidl/ServiceManagement.h>

#include <input/IInputFlinger.h>

#include <layerproto/LayerProtoParser.h>

#include <log/log.h>
@@ -441,7 +442,7 @@ SurfaceFlinger::SurfaceFlinger(Factory& factory) : SurfaceFlinger(factory, SkipI 
        // deriving the setting from the set service name, but it

        // would be brittle if the name that's not 'default' is used

        // for production purposes later on.

        setenv("TREBLE_TESTING_OVERRIDE", "true", true);

        android::hardware::details::setTrebleTestingOverride(true);

    }



    useFrameRateApi = use_frame_rate_api(true);