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

Commit a2de8585 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 8210185f: No longer need "original calling uid". 

* commit '8210185f':
  No longer need "original calling uid".
parents 8fc56006 8210185f

include/binder/IPCThreadState.h

+0 −2
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ public: 


            int                 getCallingPid();

            int                 getCallingUid();

            int                 getOrigCallingUid();



            void                setStrictModePolicy(int32_t policy);

            int32_t             getStrictModePolicy() const;
@@ -117,7 +116,6 @@ private: 
            status_t            mLastError;

            pid_t               mCallingPid;

            uid_t               mCallingUid;

            uid_t               mOrigCallingUid;

            int32_t             mStrictModePolicy;

            int32_t             mLastTransactionBinderFlags;

};

libs/binder/IPCThreadState.cpp

+0 −8
Original line number Diff line number Diff line
@@ -371,11 +371,6 @@ int IPCThreadState::getCallingUid() 
    return mCallingUid;

}



int IPCThreadState::getOrigCallingUid()

{

    return mOrigCallingUid;

}



int64_t IPCThreadState::clearCallingIdentity()

{

    int64_t token = ((int64_t)mCallingUid<<32) | mCallingPid;
@@ -646,7 +641,6 @@ IPCThreadState::IPCThreadState() 
{

    pthread_setspecific(gTLS, this);

    clearCaller();

    mOrigCallingUid = mCallingUid;

    mIn.setDataCapacity(256);

    mOut.setDataCapacity(256);

}
@@ -998,7 +992,6 @@ status_t IPCThreadState::executeCommand(int32_t cmd) 
            

            mCallingPid = tr.sender_pid;

            mCallingUid = tr.sender_euid;

            mOrigCallingUid = tr.sender_euid;

            

            int curPrio = getpriority(PRIO_PROCESS, mMyThreadId);

            if (gDisableBackgroundScheduling) {
@@ -1056,7 +1049,6 @@ status_t IPCThreadState::executeCommand(int32_t cmd) 
            

            mCallingPid = origPid;

            mCallingUid = origUid;

            mOrigCallingUid = origUid;



            IF_LOG_TRANSACTIONS() {

                TextOutput::Bundle _b(alog);