commit 91512a00615042c9e80ec3f907339389a53a9810
author Pablo Gamito <pablogamito@google.com> Tue Sep 22 18:14:43 2020 +0000
committer Pablo Gamito <pablogamito@google.com> Fri Sep 25 12:33:30 2020 +0000
tree 3cd81409485c98040f817623671e2c43ad81178b
parent 421dfd5842d44a77883fac7ad2781c363e77aed3

Add functions to parcel nullable surface controls

Test: None
Change-Id: Ia1bb5771b9d5ea9f70519d92f37ba95d57b4d6fe

libs/gui/SurfaceControl.cpp

diff --git a/libs/gui/SurfaceControl.cpp b/libs/gui/SurfaceControl.cpp
index 0246b73..6e153d9 100644
--- a/libs/gui/SurfaceControl.cpp
+++ b/libs/gui/SurfaceControl.cpp
@@ -200,5 +200,27 @@
     return NO_ERROR;
 }
 
+status_t SurfaceControl::readNullableFromParcel(const Parcel& parcel,
+                                                sp<SurfaceControl>* outSurfaceControl) {
+    bool isNotNull;
+    SAFE_PARCEL(parcel.readBool, &isNotNull);
+    if (isNotNull) {
+        SAFE_PARCEL(SurfaceControl::readFromParcel, parcel, outSurfaceControl);
+    }
+
+    return NO_ERROR;
+}
+
+status_t SurfaceControl::writeNullableToParcel(Parcel& parcel,
+                                               const sp<SurfaceControl>& surfaceControl) {
+    auto isNotNull = surfaceControl != nullptr;
+    SAFE_PARCEL(parcel.writeBool, isNotNull);
+    if (isNotNull) {
+        SAFE_PARCEL(surfaceControl->writeToParcel, parcel);
+    }
+
+    return NO_ERROR;
+}
+
 // ----------------------------------------------------------------------------
 }; // namespace android

libs/gui/include/gui/SurfaceControl.h

diff --git a/libs/gui/include/gui/SurfaceControl.h b/libs/gui/include/gui/SurfaceControl.h
index f73a9e2..e98ad53 100644
--- a/libs/gui/include/gui/SurfaceControl.h
+++ b/libs/gui/include/gui/SurfaceControl.h
@@ -47,6 +47,10 @@
     static status_t readFromParcel(const Parcel& parcel, sp<SurfaceControl>* outSurfaceControl);
     status_t writeToParcel(Parcel& parcel);
 
+    static status_t readNullableFromParcel(const Parcel& parcel,
+                                           sp<SurfaceControl>* outSurfaceControl);
+    static status_t writeNullableToParcel(Parcel& parcel, const sp<SurfaceControl>& surfaceControl);
+
     static bool isValid(const sp<SurfaceControl>& surface) {
         return (surface != nullptr) && surface->isValid();
     }