SF: Ignore setActiveColorMode errors
ag/14236477 started propagating errors, but a test broke on cuttlefish
because it returns an invalid color mode. Partially revert that until
the root cause is fixed in b/195698395.
Bug: 195603989
Test: CredentialsTest#SetActiveColorModeTest on cuttlefish
Change-Id: I61b181049b7f9b190d200d8e753596963e47591d
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index b9c31f4..99d9bb3 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -1328,7 +1328,9 @@
return NO_ERROR;
});
- return future.get();
+ // TODO(b/195698395): Propagate error.
+ future.wait();
+ return NO_ERROR;
}
void SurfaceFlinger::setAutoLowLatencyMode(const sp<IBinder>& displayToken, bool on) {