Merge "Fix mPreviouslyPresentedLayerStacks leak for bufferless layers" into main
diff --git a/libs/binder/tests/parcel_fuzzer/random_fd.cpp b/libs/binder/tests/parcel_fuzzer/random_fd.cpp
index 7390d49..4a9bd07 100644
--- a/libs/binder/tests/parcel_fuzzer/random_fd.cpp
+++ b/libs/binder/tests/parcel_fuzzer/random_fd.cpp
@@ -51,7 +51,9 @@
int flags = O_CLOEXEC;
if (provider->ConsumeBool()) flags |= O_DIRECT;
- if (provider->ConsumeBool()) flags |= O_NONBLOCK;
+
+ // TODO(b/236812909): also test blocking
+ if (true) flags |= O_NONBLOCK;
CHECK_EQ(0, pipe2(pipefds, flags)) << flags;
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index f8dd4d8..2e97b2d 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -864,9 +864,7 @@
mPowerAdvisor->init();
- char primeShaderCache[PROPERTY_VALUE_MAX];
- property_get("service.sf.prime_shader_cache", primeShaderCache, "1");
- if (atoi(primeShaderCache)) {
+ if (base::GetBoolProperty("service.sf.prime_shader_cache"s, true)) {
if (setSchedFifo(false) != NO_ERROR) {
ALOGW("Can't set SCHED_OTHER for primeCache");
}