commit ca3d9a423ae718c62fcda4fb249e0760a6fb3727
author Huihong Luo <huisinro@google.com> Tue Feb 22 11:07:34 2022 -0800
committer Huihong Luo <huisinro@google.com> Thu Mar 31 11:30:31 2022 -0700
tree 95d419a397f2252bb0cbf8be21ede9751a6993cf
parent c6855f857f9c62eebed613928d5af88a9ea9a068

Convert DisplayPrimaries to AIDL parcelable

And migrate related ISurfaceComposer::getDisplayNativePrimaries() method to AIDL.
(1) add android::gui::DisplayNativePrimaries parcelable for serialization
(2) convert between ui::DisplayPrimaries and gui::DisplayPrimaries
(3) migrate setActiveColorMode
(4) migrate setBootDisplayMode

Bug: 220894272
Test: atest libgui_test
Change-Id: I1371f6ef2c1f52f56db53d437cf919ee7f269b48

services/surfaceflinger/tests/BootDisplayMode_test.cpp

diff --git a/services/surfaceflinger/tests/BootDisplayMode_test.cpp b/services/surfaceflinger/tests/BootDisplayMode_test.cpp
index d70908e..4cd6ef8 100644
--- a/services/surfaceflinger/tests/BootDisplayMode_test.cpp
+++ b/services/surfaceflinger/tests/BootDisplayMode_test.cpp
@@ -26,14 +26,14 @@
 namespace android {
 
 TEST(BootDisplayModeTest, setBootDisplayMode) {
-    sp<ISurfaceComposer> sf(ComposerService::getComposerService());
-    sp<gui::ISurfaceComposer> sf_aidl(ComposerServiceAIDL::getComposerService());
+    sp<gui::ISurfaceComposer> sf(ComposerServiceAIDL::getComposerService());
     auto displayToken = SurfaceComposerClient::getInternalDisplayToken();
     bool bootModeSupport = false;
-    binder::Status status = sf_aidl->getBootDisplayModeSupport(&bootModeSupport);
+    binder::Status status = sf->getBootDisplayModeSupport(&bootModeSupport);
     ASSERT_NO_FATAL_FAILURE(status.transactionError());
     if (bootModeSupport) {
-        ASSERT_EQ(NO_ERROR, sf->setBootDisplayMode(displayToken, 0));
+        status = sf->setBootDisplayMode(displayToken, 0);
+        ASSERT_EQ(NO_ERROR, status.transactionError());
     }
 }