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

Commit 5c7563ce authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Moved some thread priority changes. am: 9091be3e am: bbfa310e 

Change-Id: Ief3eecda9afea398ef8600905ec58f50fae31944
parents 30df04e3 bbfa310e

core/java/com/android/internal/os/Zygote.java

+9 −6
Original line number Diff line number Diff line
@@ -269,6 +269,9 @@ public final class Zygote { 
            Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "PostFork");

        }



        // Set the Java Language thread priority to the default value for new apps.

        Thread.currentThread().setPriority(Thread.NORM_PRIORITY);



        ZygoteHooks.postForkCommon();

        return pid;

    }
@@ -311,6 +314,9 @@ public final class Zygote { 
        // Note that this event ends at the end of handleChildProc.

        Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "PostFork");



        // Set the Java Language thread priority to the default value for new apps.

        Thread.currentThread().setPriority(Thread.NORM_PRIORITY);



        /*

         * This is called here (instead of after the fork but before the specialize) to maintain

         * consistancy with the code paths for forkAndSpecialize.
@@ -365,6 +371,9 @@ public final class Zygote { 
            Trace.setTracingEnabled(true, runtimeFlags);

        }



        // Set the Java Language thread priority to the default value for new apps.

        Thread.currentThread().setPriority(Thread.NORM_PRIORITY);



        ZygoteHooks.postForkCommon();

        return pid;

    }
@@ -651,12 +660,6 @@ public final class Zygote { 


            disableExecuteOnly(args.mTargetSdkVersion);



            // End of the postFork event.

            Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);



            // Set the Java Language thread priority to the default value for new apps.

            Thread.currentThread().setPriority(Thread.NORM_PRIORITY);



            return ZygoteInit.zygoteInit(args.mTargetSdkVersion,

                    args.mDisabledCompatChanges,

                    args.mRemainingArgs,

core/java/com/android/internal/os/ZygoteConnection.java

+0 −3
Original line number Diff line number Diff line
@@ -487,9 +487,6 @@ class ZygoteConnection { 


        Zygote.setAppProcessName(parsedArgs, TAG);



        // Set the Java Language thread priority to the default value for new apps.

        Thread.currentThread().setPriority(Thread.NORM_PRIORITY);



        // End of the postFork event.

        Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);

        if (parsedArgs.mInvokeWith != null) {

core/java/com/android/internal/os/ZygoteInit.java

+0 −3
Original line number Diff line number Diff line
@@ -518,9 +518,6 @@ public class ZygoteInit { 
            }

        }



        // Set the Java Language thread priority to the default value for the system server.

        Thread.currentThread().setPriority(Thread.NORM_PRIORITY);



        if (parsedArgs.mInvokeWith != null) {

            String[] args = parsedArgs.mRemainingArgs;

            // If we have a non-null system server class path, we'll have to duplicate the