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

Commit 631e2e19 authored by Li Li's avatar Li Li Committed by Automerger Merge Worker
Browse files

Remove the redundant getProcessFreezeInfo() am: 4e678b98 

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

Change-Id: Id852ed41260cc0cabbe6efe03baec4b1ae8ee5d5
parents b753c5a9 4e678b98

libs/binder/IPCThreadState.cpp

+0 −18
Original line number Diff line number Diff line
@@ -1410,23 +1410,6 @@ void IPCThreadState::threadDestructor(void *st) 
        }

}



status_t IPCThreadState::getProcessFreezeInfo(pid_t pid, bool *sync_received, bool *async_received)

{

    int ret = 0;

    binder_frozen_status_info info;

    info.pid = pid;



#if defined(__ANDROID__)

    if (ioctl(self()->mProcess->mDriverFD, BINDER_GET_FROZEN_INFO, &info) < 0)

        ret = -errno;

#endif

    *sync_received = info.sync_recv;

    *async_received = info.async_recv;



    return ret;

}



#ifndef __ANDROID_VNDK__

status_t IPCThreadState::getProcessFreezeInfo(pid_t pid, uint32_t *sync_received,

                                              uint32_t *async_received)

{
@@ -1443,7 +1426,6 @@ status_t IPCThreadState::getProcessFreezeInfo(pid_t pid, uint32_t *sync_received 


    return ret;

}

#endif



status_t IPCThreadState::freeze(pid_t pid, bool enable, uint32_t timeout_ms) {

    struct binder_freeze_info info;

libs/binder/include/binder/IPCThreadState.h

+1 −7
Original line number Diff line number Diff line
@@ -51,14 +51,8 @@ public: 
    static  status_t            freeze(pid_t pid, bool enabled, uint32_t timeout_ms);



    // Provide information about the state of a frozen process

    static  status_t            getProcessFreezeInfo(pid_t pid, bool *sync_received,

                                                    bool *async_received);



    // TODO: Remove the above legacy duplicated function in next version

#ifndef __ANDROID_VNDK__

    static  status_t            getProcessFreezeInfo(pid_t pid, uint32_t *sync_received,

                                                    uint32_t *async_received);

#endif



            sp<ProcessState>    process();

libs/binder/tests/binderLibTest.cpp

+2 −10
Original line number Diff line number Diff line
@@ -491,7 +491,7 @@ TEST_F(BinderLibTest, Freeze) { 
    EXPECT_EQ(NO_ERROR, IPCThreadState::self()->freeze(pid, true, 1000));

    EXPECT_EQ(FAILED_TRANSACTION, m_server->transact(BINDER_LIB_TEST_NOP_TRANSACTION, data, &reply));



    bool sync_received, async_received;

    uint32_t sync_received, async_received;



    EXPECT_EQ(NO_ERROR, IPCThreadState::self()->getProcessFreezeInfo(pid, &sync_received,

                &async_received));
@@ -499,15 +499,7 @@ TEST_F(BinderLibTest, Freeze) { 
    EXPECT_EQ(sync_received, 1);

    EXPECT_EQ(async_received, 0);



    uint32_t sync_received2, async_received2;



    EXPECT_EQ(NO_ERROR, IPCThreadState::self()->getProcessFreezeInfo(pid, &sync_received2,

                &async_received2));



    EXPECT_EQ(sync_received2, 1);

    EXPECT_EQ(async_received2, 0);



    EXPECT_EQ(NO_ERROR, IPCThreadState::self()->freeze(pid, 0, 0));

    EXPECT_EQ(NO_ERROR, IPCThreadState::self()->freeze(pid, false, 0));

    EXPECT_EQ(NO_ERROR, m_server->transact(BINDER_LIB_TEST_NOP_TRANSACTION, data, &reply));

}