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

Commit c2694b13 authored by Iliyan Malchev's avatar Iliyan Malchev Committed by android-build-merger
Browse files

binder: add getDriverName() am: 32062246 

am: 730812bd

Change-Id: I3469e6d094565d698f6fc78431beaf17469fa431
parents 8f31581d 730812bd

include/binder/ProcessState.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -69,6 +69,8 @@ public: 
            status_t            setThreadPoolMaxThreadCount(size_t maxThreads);

            status_t            setThreadPoolMaxThreadCount(size_t maxThreads);

            void                giveThreadPoolName();

            void                giveThreadPoolName();





            String8             getDriverName();



private:

private:

    friend class IPCThreadState;

    friend class IPCThreadState;
@@ -86,6 +88,7 @@ private: 




            handle_entry*       lookupHandleLocked(int32_t handle);

            handle_entry*       lookupHandleLocked(int32_t handle);





            String8             mDriverName;

            int                 mDriverFD;

            int                 mDriverFD;

            void*               mVMStart;

            void*               mVMStart;

libs/binder/ProcessState.cpp

+7 −1
Original line number Original line Diff line number Diff line
@@ -317,6 +317,10 @@ void ProcessState::giveThreadPoolName() { 
    androidSetThreadName( makeBinderThreadName().string() );

    androidSetThreadName( makeBinderThreadName().string() );

}

}





String8 ProcessState::getDriverName() {

    return mDriverName;

}



static int open_driver(const char *driver)

static int open_driver(const char *driver)

{

{

    int fd = open(driver, O_RDWR | O_CLOEXEC);

    int fd = open(driver, O_RDWR | O_CLOEXEC);
@@ -346,7 +350,8 @@ static int open_driver(const char *driver) 
}

}





ProcessState::ProcessState(const char *driver)

ProcessState::ProcessState(const char *driver)

    : mDriverFD(open_driver(driver))

    : mDriverName(String8(driver))

    , mDriverFD(open_driver(driver))

    , mVMStart(MAP_FAILED)

    , mVMStart(MAP_FAILED)

    , mThreadCountLock(PTHREAD_MUTEX_INITIALIZER)

    , mThreadCountLock(PTHREAD_MUTEX_INITIALIZER)

    , mThreadCountDecrement(PTHREAD_COND_INITIALIZER)

    , mThreadCountDecrement(PTHREAD_COND_INITIALIZER)
@@ -367,6 +372,7 @@ ProcessState::ProcessState(const char *driver) 
            ALOGE("Using /dev/binder failed: unable to mmap transaction memory.\n");

            ALOGE("Using /dev/binder failed: unable to mmap transaction memory.\n");

            close(mDriverFD);

            close(mDriverFD);

            mDriverFD = -1;

            mDriverFD = -1;

            mDriverName.clear();

        }

        }

    }

    }