diff options
| author | 2020-07-09 18:23:54 +0000 | |
|---|---|---|
| committer | 2020-07-09 18:23:54 +0000 | |
| commit | f7adb9a96f727b43ee31fec229d03f8bfd1e15db (patch) | |
| tree | 3cabfb51374e0a417fab2c0e7b6a4e9d3a5f9c75 | |
| parent | 21dcb37a361061474ec374dceb108c8a6f855d37 (diff) | |
| parent | d6a1f122cc2b2d46262c2c9b657bb157c8eb4714 (diff) | |
Merge "Avoid TREBLE_TESTING_OVERRIDE" am: 88fdc661b9 am: 1e59efe271 am: d6a1f122cc
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1357927
Change-Id: Iced5c9c348ec60f202e215581e5713874d65a9a2
| -rw-r--r-- | services/surfaceflinger/SurfaceFlinger.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index 0ac3d329e9..9d65f2f2af 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -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); |