Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 785d2e2a authored by Jim Shargo's avatar Jim Shargo
Browse files

view::Surface: Add toString() 

This is used for the generation of AIDL files, I'm not sure why it
hasn't broken before.

For now, it just returns the set name of the view Surface.

Bug: 340933754
Flag: EXEMPT only builds in later test, is otherwise unused
functionality, required to build
Test: new test in libgui_test

Change-Id: I86ea29a8ea7dc8270fc471a0cfd04eb38e015045
parent 089099c3

libs/gui/include/gui/view/Surface.h

+2 −1
Original line number Diff line number Diff line
@@ -59,8 +59,9 @@ class Surface : public Parcelable { 
    // of the full parceling to happen on its native side.

    status_t readFromParcel(const Parcel* parcel, bool nameAlreadyRead);



  private:

    std::string toString() const;



private:

    static String16 readMaybeEmptyString16(const Parcel* parcel);

};

libs/gui/tests/Surface_test.cpp

+9 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
 * limitations under the License.

 */



#include "gui/view/Surface.h"

#include "Constants.h"

#include "MockConsumer.h"
@@ -2363,6 +2364,14 @@ TEST_F(SurfaceTest, QueueAcquireReleaseDequeue_CalledInStack_DoesNotDeadlock) { 


    EXPECT_EQ(OK, surface->disconnect(NATIVE_WINDOW_API_CPU));

}



TEST_F(SurfaceTest, ViewSurface_toString) {

    view::Surface surface{};

    EXPECT_EQ("", surface.toString());



    surface.name = String16("name");

    EXPECT_EQ("name", surface.toString());

}

#endif // COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(WB_PLATFORM_API_IMPROVEMENTS)



} // namespace android

libs/gui/view/Surface.cpp

+6 −0
Original line number Diff line number Diff line
@@ -121,5 +121,11 @@ String16 Surface::readMaybeEmptyString16(const Parcel* parcel) { 
    return str.value_or(String16());

}



std::string Surface::toString() const {

    std::stringstream out;

    out << name;

    return out.str();

}



} // namespace view

} // namespace android