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

Commit 612ee8e6 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by Automerger Merge Worker
Browse files

Merge "Fix or silence binder build warnings on clang" into main am: 9c1783ec 

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



Change-Id: I9c5a8bae4ce7994fb64ec8734ac461da5c68da6c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 33fb10a5 9c1783ec

libs/binder/ndk/tests/iface.cpp

+3 −0
Original line number Original line Diff line number Diff line
@@ -156,7 +156,10 @@ binder_status_t IFoo::addService(const char* instance) { 
}

}





sp<IFoo> IFoo::getService(const char* instance, AIBinder** outBinder) {

sp<IFoo> IFoo::getService(const char* instance, AIBinder** outBinder) {

#pragma clang diagnostic push

#pragma clang diagnostic ignored "-Wdeprecated-declarations"

    AIBinder* binder = AServiceManager_getService(instance);  // maybe nullptr

    AIBinder* binder = AServiceManager_getService(instance);  // maybe nullptr

#pragma clang diagnostic pop

    if (binder == nullptr) {

    if (binder == nullptr) {

        return nullptr;

        return nullptr;

    }

    }

libs/binder/ndk/tests/libbinder_ndk_unit_test.cpp

+39 −0
Original line number Original line Diff line number Diff line
@@ -341,7 +341,10 @@ TEST(NdkBinder, UnimplementedShell) { 
    // libbinder across processes to the NDK service which doesn't implement

    // libbinder across processes to the NDK service which doesn't implement

    // shell

    // shell

    static const sp<android::IServiceManager> sm(android::defaultServiceManager());

    static const sp<android::IServiceManager> sm(android::defaultServiceManager());

#pragma clang diagnostic push

#pragma clang diagnostic ignored "-Wdeprecated-declarations"

    sp<IBinder> testService = sm->getService(String16(IFoo::kSomeInstanceName));

    sp<IBinder> testService = sm->getService(String16(IFoo::kSomeInstanceName));

#pragma clang diagnostic pop





    Vector<String16> argsVec;

    Vector<String16> argsVec;

    EXPECT_EQ(OK, IBinder::shellCommand(testService, STDIN_FILENO, STDOUT_FILENO, STDERR_FILENO,

    EXPECT_EQ(OK, IBinder::shellCommand(testService, STDIN_FILENO, STDOUT_FILENO, STDERR_FILENO,
@@ -384,7 +387,10 @@ TEST(NdkBinder, GetTestServiceStressTest) { 
    // checkService on it, since the other process serving it might not be started yet.

    // checkService on it, since the other process serving it might not be started yet.

    {

    {

        // getService, not waitForService, to take advantage of timeout

        // getService, not waitForService, to take advantage of timeout

#pragma clang diagnostic push

#pragma clang diagnostic ignored "-Wdeprecated-declarations"

        auto binder = ndk::SpAIBinder(AServiceManager_getService(IFoo::kSomeInstanceName));

        auto binder = ndk::SpAIBinder(AServiceManager_getService(IFoo::kSomeInstanceName));

#pragma clang diagnostic pop

        ASSERT_NE(nullptr, binder.get());

        ASSERT_NE(nullptr, binder.get());

    }

    }
@@ -574,7 +580,10 @@ TEST(NdkBinder, DeathRecipient) { 
}

}





TEST(NdkBinder, RetrieveNonNdkService) {

TEST(NdkBinder, RetrieveNonNdkService) {

#pragma clang diagnostic push

#pragma clang diagnostic ignored "-Wdeprecated-declarations"

    AIBinder* binder = AServiceManager_getService(kExistingNonNdkService);

    AIBinder* binder = AServiceManager_getService(kExistingNonNdkService);

#pragma clang diagnostic pop

    ASSERT_NE(nullptr, binder);

    ASSERT_NE(nullptr, binder);

    EXPECT_TRUE(AIBinder_isRemote(binder));

    EXPECT_TRUE(AIBinder_isRemote(binder));

    EXPECT_TRUE(AIBinder_isAlive(binder));

    EXPECT_TRUE(AIBinder_isAlive(binder));
@@ -588,7 +597,10 @@ void OnBinderDeath(void* cookie) { 
}

}





TEST(NdkBinder, LinkToDeath) {

TEST(NdkBinder, LinkToDeath) {

#pragma clang diagnostic push

#pragma clang diagnostic ignored "-Wdeprecated-declarations"

    AIBinder* binder = AServiceManager_getService(kExistingNonNdkService);

    AIBinder* binder = AServiceManager_getService(kExistingNonNdkService);

#pragma clang diagnostic pop

    ASSERT_NE(nullptr, binder);

    ASSERT_NE(nullptr, binder);





    AIBinder_DeathRecipient* recipient = AIBinder_DeathRecipient_new(OnBinderDeath);

    AIBinder_DeathRecipient* recipient = AIBinder_DeathRecipient_new(OnBinderDeath);
@@ -618,7 +630,10 @@ TEST(NdkBinder, SetInheritRt) { 
}

}





TEST(NdkBinder, SetInheritRtNonLocal) {

TEST(NdkBinder, SetInheritRtNonLocal) {

#pragma clang diagnostic push

#pragma clang diagnostic ignored "-Wdeprecated-declarations"

    AIBinder* binder = AServiceManager_getService(kExistingNonNdkService);

    AIBinder* binder = AServiceManager_getService(kExistingNonNdkService);

#pragma clang diagnostic pop

    ASSERT_NE(binder, nullptr);

    ASSERT_NE(binder, nullptr);





    ASSERT_TRUE(AIBinder_isRemote(binder));

    ASSERT_TRUE(AIBinder_isRemote(binder));
@@ -654,11 +669,14 @@ TEST(NdkBinder, GetServiceInProcess) { 
}

}





TEST(NdkBinder, EqualityOfRemoteBinderPointer) {

TEST(NdkBinder, EqualityOfRemoteBinderPointer) {

#pragma clang diagnostic push

#pragma clang diagnostic ignored "-Wdeprecated-declarations"

    AIBinder* binderA = AServiceManager_getService(kExistingNonNdkService);

    AIBinder* binderA = AServiceManager_getService(kExistingNonNdkService);

    ASSERT_NE(nullptr, binderA);

    ASSERT_NE(nullptr, binderA);





    AIBinder* binderB = AServiceManager_getService(kExistingNonNdkService);

    AIBinder* binderB = AServiceManager_getService(kExistingNonNdkService);

    ASSERT_NE(nullptr, binderB);

    ASSERT_NE(nullptr, binderB);

#pragma clang diagnostic pop





    EXPECT_EQ(binderA, binderB);

    EXPECT_EQ(binderA, binderB);
@@ -672,7 +690,10 @@ TEST(NdkBinder, ToFromJavaNullptr) { 
}

}





TEST(NdkBinder, ABpBinderRefCount) {

TEST(NdkBinder, ABpBinderRefCount) {

#pragma clang diagnostic push

#pragma clang diagnostic ignored "-Wdeprecated-declarations"

    AIBinder* binder = AServiceManager_getService(kExistingNonNdkService);

    AIBinder* binder = AServiceManager_getService(kExistingNonNdkService);

#pragma clang diagnostic pop

    AIBinder_Weak* wBinder = AIBinder_Weak_new(binder);

    AIBinder_Weak* wBinder = AIBinder_Weak_new(binder);





    ASSERT_NE(nullptr, binder);

    ASSERT_NE(nullptr, binder);
@@ -695,7 +716,10 @@ TEST(NdkBinder, AddServiceMultipleTimes) { 
}

}





TEST(NdkBinder, RequestedSidWorks) {

TEST(NdkBinder, RequestedSidWorks) {

#pragma clang diagnostic push

#pragma clang diagnostic ignored "-Wdeprecated-declarations"

    ndk::SpAIBinder binder(AServiceManager_getService(kBinderNdkUnitTestService));

    ndk::SpAIBinder binder(AServiceManager_getService(kBinderNdkUnitTestService));

#pragma clang diagnostic pop

    std::shared_ptr<aidl::IBinderNdkUnitTest> service =

    std::shared_ptr<aidl::IBinderNdkUnitTest> service =

            aidl::IBinderNdkUnitTest::fromBinder(binder);

            aidl::IBinderNdkUnitTest::fromBinder(binder);
@@ -718,7 +742,10 @@ TEST(NdkBinder, SentAidlBinderCanBeDestroyed) { 




    std::shared_ptr<MyEmpty> empty = ndk::SharedRefBase::make<MyEmpty>();

    std::shared_ptr<MyEmpty> empty = ndk::SharedRefBase::make<MyEmpty>();





#pragma clang diagnostic push

#pragma clang diagnostic ignored "-Wdeprecated-declarations"

    ndk::SpAIBinder binder(AServiceManager_getService(kBinderNdkUnitTestService));

    ndk::SpAIBinder binder(AServiceManager_getService(kBinderNdkUnitTestService));

#pragma clang diagnostic pop

    std::shared_ptr<aidl::IBinderNdkUnitTest> service =

    std::shared_ptr<aidl::IBinderNdkUnitTest> service =

            aidl::IBinderNdkUnitTest::fromBinder(binder);

            aidl::IBinderNdkUnitTest::fromBinder(binder);
@@ -741,7 +768,10 @@ TEST(NdkBinder, SentAidlBinderCanBeDestroyed) { 
TEST(NdkBinder, ConvertToPlatformBinder) {

TEST(NdkBinder, ConvertToPlatformBinder) {

    for (const ndk::SpAIBinder& binder :

    for (const ndk::SpAIBinder& binder :

         {// remote

         {// remote

#pragma clang diagnostic push

#pragma clang diagnostic ignored "-Wdeprecated-declarations"

          ndk::SpAIBinder(AServiceManager_getService(kBinderNdkUnitTestService)),

          ndk::SpAIBinder(AServiceManager_getService(kBinderNdkUnitTestService)),

#pragma clang diagnostic pop

          // local

          // local

          ndk::SharedRefBase::make<MyBinderNdkUnitTest>()->asBinder()}) {

          ndk::SharedRefBase::make<MyBinderNdkUnitTest>()->asBinder()}) {

        // convert to platform binder

        // convert to platform binder
@@ -774,7 +804,10 @@ TEST(NdkBinder, ConvertToPlatformParcel) { 
TEST(NdkBinder, GetAndVerifyScopedAIBinder_Weak) {

TEST(NdkBinder, GetAndVerifyScopedAIBinder_Weak) {

    for (const ndk::SpAIBinder& binder :

    for (const ndk::SpAIBinder& binder :

         {// remote

         {// remote

#pragma clang diagnostic push

#pragma clang diagnostic ignored "-Wdeprecated-declarations"

          ndk::SpAIBinder(AServiceManager_getService(kBinderNdkUnitTestService)),

          ndk::SpAIBinder(AServiceManager_getService(kBinderNdkUnitTestService)),

#pragma clang diagnostic pop

          // local

          // local

          ndk::SharedRefBase::make<MyBinderNdkUnitTest>()->asBinder()}) {

          ndk::SharedRefBase::make<MyBinderNdkUnitTest>()->asBinder()}) {

        // get a const ScopedAIBinder_Weak and verify promote

        // get a const ScopedAIBinder_Weak and verify promote
@@ -869,7 +902,10 @@ std::string shellCmdToString(sp<IBinder> unitTestService, const std::vector<cons 




TEST(NdkBinder, UseHandleShellCommand) {

TEST(NdkBinder, UseHandleShellCommand) {

    static const sp<android::IServiceManager> sm(android::defaultServiceManager());

    static const sp<android::IServiceManager> sm(android::defaultServiceManager());

#pragma clang diagnostic push

#pragma clang diagnostic ignored "-Wdeprecated-declarations"

    sp<IBinder> testService = sm->getService(String16(kBinderNdkUnitTestService));

    sp<IBinder> testService = sm->getService(String16(kBinderNdkUnitTestService));

#pragma clang diagnostic pop





    EXPECT_EQ("", shellCmdToString(testService, {}));

    EXPECT_EQ("", shellCmdToString(testService, {}));

    EXPECT_EQ("", shellCmdToString(testService, {"", ""}));

    EXPECT_EQ("", shellCmdToString(testService, {"", ""}));
@@ -879,7 +915,10 @@ TEST(NdkBinder, UseHandleShellCommand) { 




TEST(NdkBinder, FlaggedServiceAccessible) {

TEST(NdkBinder, FlaggedServiceAccessible) {

    static const sp<android::IServiceManager> sm(android::defaultServiceManager());

    static const sp<android::IServiceManager> sm(android::defaultServiceManager());

#pragma clang diagnostic push

#pragma clang diagnostic ignored "-Wdeprecated-declarations"

    sp<IBinder> testService = sm->getService(String16(kBinderNdkUnitTestServiceFlagged));

    sp<IBinder> testService = sm->getService(String16(kBinderNdkUnitTestServiceFlagged));

#pragma clang diagnostic pop

    ASSERT_NE(nullptr, testService);

    ASSERT_NE(nullptr, testService);

}

}

libs/binder/rust/tests/serialization.hpp

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

 * limitations under the License.

 */

 */





#pragma clang diagnostic push

#pragma clang diagnostic ignored "-Wpragma-once-outside-header"

#pragma once

#pragma once

#pragma clang diagnostic pop





#include <binder/IBinder.h>

#include <binder/IBinder.h>

libs/binder/servicedispatcher.cpp

+3 −0
Original line number Original line Diff line number Diff line
@@ -279,7 +279,10 @@ int main(int argc, char* argv[]) { 
    while (-1 != (opt = getopt(argc, argv, "gi:"))) {

    while (-1 != (opt = getopt(argc, argv, "gi:"))) {

        switch (opt) {

        switch (opt) {

            case 'g': {

            case 'g': {

#pragma clang diagnostic push

#pragma clang diagnostic ignored "-Wdeprecated-declarations"

                serviceRetriever = &android::IServiceManager::getService;

                serviceRetriever = &android::IServiceManager::getService;

#pragma clang diagnostic pop

            } break;

            } break;

            case 'i': {

            case 'i': {

                ip_address = optarg;

                ip_address = optarg;

libs/binder/tests/binderClearBufTest.cpp

+3 −0
Original line number Original line Diff line number Diff line
@@ -74,7 +74,10 @@ class FooBar : public BBinder { 
};

};





TEST(BinderClearBuf, ClearKernelBuffer) {

TEST(BinderClearBuf, ClearKernelBuffer) {

#pragma clang diagnostic push

#pragma clang diagnostic ignored "-Wdeprecated-declarations"

    sp<IBinder> binder = defaultServiceManager()->getService(kServerName);

    sp<IBinder> binder = defaultServiceManager()->getService(kServerName);

#pragma clang diagnostic pop

    ASSERT_NE(nullptr, binder);

    ASSERT_NE(nullptr, binder);





    std::string replyBuffer;

    std::string replyBuffer;