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

Commit 420176e7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "libbinder: remove unused context variables" am: 280af8eb am:... 

Merge "libbinder: remove unused context variables" am: 280af8eb am: 3219ae64 am: 65e60df3 am: a4fb71cc am: eb1e778e

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

Change-Id: I2ee9d93db05abefa02e0961d11d04caa56c2aafa
parents 5f40945a eb1e778e

cmds/servicemanager/main.cpp

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ int main(int argc, char** argv) { 
    }



    IPCThreadState::self()->setTheContextObject(manager);

    ps->becomeContextManager(nullptr, nullptr);

    ps->becomeContextManager();



    sp<Looper> looper = Looper::prepare(false /*allowNonCallbacks*/);

libs/binder/ProcessState.cpp

+1 −7
Original line number Diff line number Diff line
@@ -144,11 +144,9 @@ void ProcessState::startThreadPool() 
    }

}



bool ProcessState::becomeContextManager(context_check_func checkFunc, void* userData)

bool ProcessState::becomeContextManager()

{

    AutoMutex _l(mLock);

    mBinderContextCheckFunc = checkFunc;

    mBinderContextUserData = userData;



    flat_binder_object obj {

        .flags = FLAT_BINDER_FLAG_TXN_SECURITY_CTX,
@@ -165,8 +163,6 @@ bool ProcessState::becomeContextManager(context_check_func checkFunc, void* user 
    }



    if (result == -1) {

        mBinderContextCheckFunc = nullptr;

        mBinderContextUserData = nullptr;

        ALOGE("Binder ioctl to become context manager failed: %s\n", strerror(errno));

    }
@@ -397,8 +393,6 @@ ProcessState::ProcessState(const char *driver) 
    , mExecutingThreadsCount(0)

    , mMaxThreads(DEFAULT_MAX_BINDER_THREADS)

    , mStarvationStartTimeMs(0)

    , mBinderContextCheckFunc(nullptr)

    , mBinderContextUserData(nullptr)

    , mThreadPoolStarted(false)

    , mThreadPoolSeq(1)

    , mCallRestriction(CallRestriction::NONE)

libs/binder/include/binder/ProcessState.h

+1 −10
Original line number Diff line number Diff line
@@ -51,13 +51,7 @@ public: 


            void                startThreadPool();



    typedef bool (*context_check_func)(const String16& name,

                                       const sp<IBinder>& caller,

                                       void* userData);



            bool                becomeContextManager(

                                    context_check_func checkFunc,

                                    void* userData);

            bool                becomeContextManager();



            sp<IBinder>         getStrongProxyForHandle(int32_t handle);

            void                expungeHandle(int32_t handle, IBinder* binder);
@@ -128,9 +122,6 @@ private: 


            Vector<handle_entry>mHandleToObject;



            context_check_func  mBinderContextCheckFunc;

            void*               mBinderContextUserData;



            String8             mRootDir;

            bool                mThreadPoolStarted;

    volatile int32_t            mThreadPoolSeq;