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

Commit 1eed0779 authored by Dan Pasanen's avatar Dan Pasanen
Browse files

Merge tag 'android-7.1.2_r17' into cm-14.1 

Android 7.1.2 Release 17 (NJH47B)

# gpg: Signature made Fri 02 Jun 2017 05:09:05 PM CDT
# gpg:                using DSA key E8AD3F819AB10E78
# gpg: Can't check signature: No public key
parents c68520a0 783b76e6

include/binder/IPCThreadState.h

+0 −1
Original line number Diff line number Diff line
@@ -115,7 +115,6 @@ private: 
                                           void* cookie);

    

    const   sp<ProcessState>    mProcess;

    const   pid_t               mMyThreadId;

            Vector<BBinder*>    mPendingStrongDerefs;

            Vector<RefBase::weakref_type*> mPendingWeakDerefs;

libs/binder/IPCThreadState.cpp

+64 −98
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
#define IF_LOG_COMMANDS() if (false)

#define LOG_REMOTEREFS(...) 

#define IF_LOG_REMOTEREFS() if (false)



#define LOG_THREADPOOL(...) 

#define LOG_ONEWAY(...)
@@ -458,15 +459,6 @@ status_t IPCThreadState::getAndExecuteCommand() 
        }

        pthread_cond_broadcast(&mProcess->mThreadCountDecrement);

        pthread_mutex_unlock(&mProcess->mThreadCountLock);



        // After executing the command, ensure that the thread is returned to the

        // foreground cgroup before rejoining the pool.  The driver takes care of

        // restoring the priority, but doesn't do anything with cgroups so we

        // need to take care of that here in userspace.  Note that we do make

        // sure to go in the foreground after executing a transaction, but

        // there are other callbacks into user code that could have changed

        // our group so we want to make absolutely sure it is put back.

        set_sched_policy(mMyThreadId, SP_FOREGROUND);

    }



    return result;
@@ -502,11 +494,6 @@ void IPCThreadState::joinThreadPool(bool isMain) 


    mOut.writeInt32(isMain ? BC_ENTER_LOOPER : BC_REGISTER_LOOPER);



    // This thread may have been spawned by a thread that was in the background

    // scheduling group, so first we will make sure it is in the foreground

    // one to avoid performing an initial transaction in the background.

    set_sched_policy(mMyThreadId, SP_FOREGROUND);

        

    status_t result;

    do {

        processPendingDerefs();
@@ -707,7 +694,6 @@ status_t IPCThreadState::clearDeathNotification(int32_t handle, BpBinder* proxy) 


IPCThreadState::IPCThreadState()

    : mProcess(ProcessState::self()),

      mMyThreadId(gettid()),

      mStrictModePolicy(0),

      mLastTransactionBinderFlags(0)

{
@@ -1069,26 +1055,6 @@ status_t IPCThreadState::executeCommand(int32_t cmd) 
            mCallingUid = tr.sender_euid;

            mLastTransactionBinderFlags = tr.flags;



            int curPrio = getpriority(PRIO_PROCESS, mMyThreadId);

            if (gDisableBackgroundScheduling) {

                if (curPrio > ANDROID_PRIORITY_NORMAL) {

                    // We have inherited a reduced priority from the caller, but do not

                    // want to run in that state in this process.  The driver set our

                    // priority already (though not our scheduling class), so bounce

                    // it back to the default before invoking the transaction.

                    setpriority(PRIO_PROCESS, mMyThreadId, ANDROID_PRIORITY_NORMAL);

                }

            } else {

                if (curPrio >= ANDROID_PRIORITY_BACKGROUND) {

                    // We want to use the inherited priority from the caller.

                    // Ensure this thread is in the background scheduling class,

                    // since the driver won't modify scheduling classes for us.

                    // The scheduling group is reset to default by the caller

                    // once this method returns after the transaction is complete.

                    set_sched_policy(mMyThreadId, SP_BACKGROUND);

                }

            }



            //ALOGI(">>>> TRANSACT from pid %d uid %d\n", mCallingPid, mCallingUid);



            Parcel reply;