| commit | 1e59efe2711604e45f43f9dc5b6be52f18560f43 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Jul 09 17:59:44 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 09 17:59:44 2020 +0000 |
| tree | 3dba2702a96ab807c8d1c996424d3ef449c8e48b | |
| parent | 8ff469661b23efeeab1c44d6265d41c5bf9f335a [diff] | |
| parent | 88fdc661b92209dd115da725454e0b4b38b31f8d [diff] |
Merge "Avoid TREBLE_TESTING_OVERRIDE" am: 88fdc661b9 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1357927 Change-Id: I27bb7be59b4347683484f7a849532bde22e6d062
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index 60b3cf0..c033290 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -55,6 +55,7 @@ #include <gui/IProducerListener.h> #include <gui/LayerDebugInfo.h> #include <gui/Surface.h> +#include <hidl/ServiceManagement.h> #include <input/IInputFlinger.h> #include <renderengine/RenderEngine.h> #include <ui/ColorSpace.h> @@ -401,7 +402,7 @@ // 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); } }