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

Commit 4733d234 authored by Devin Moore's avatar Devin Moore Committed by Automerger Merge Worker
Browse files

Merge "Change binderRpcTest to use 'activity' for a Java test service" into... 

Merge "Change binderRpcTest to use 'activity' for a Java test service" into main am: a0f9b791 am: 9bbb8378

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3218607



Change-Id: If1b2c887c435f055dfac116c3a40e072b1d0008a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 34f25e08 9bbb8378

libs/binder/tests/binderRpcTest.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -1384,8 +1384,8 @@ TEST(BinderRpc, Java) { 
    sp<IServiceManager> sm = defaultServiceManager();

    sp<IServiceManager> sm = defaultServiceManager();

    ASSERT_NE(nullptr, sm);

    ASSERT_NE(nullptr, sm);

    // Any Java service with non-empty getInterfaceDescriptor() would do.

    // Any Java service with non-empty getInterfaceDescriptor() would do.

    // Let's pick batteryproperties.

    // Let's pick activity.

    auto binder = sm->checkService(String16("batteryproperties"));

    auto binder = sm->checkService(String16("activity"));

    ASSERT_NE(nullptr, binder);

    ASSERT_NE(nullptr, binder);

    auto descriptor = binder->getInterfaceDescriptor();

    auto descriptor = binder->getInterfaceDescriptor();

    ASSERT_GE(descriptor.size(), 0u);

    ASSERT_GE(descriptor.size(), 0u);