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

Commit e5ae45f7 authored by Rick Yiu's avatar Rick Yiu
Browse files

Revert "Implement the ThreadPrioritySetter interface" 

Revert submission 1202786-setpriority

Reason for revert: will cause lock contention

Bug: 139521784
Test: build pass
Change-Id: I863fd0c1623ad7fe73a192400389d25bf9e75e90
parent f2990228

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

+0 −31
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ import com.android.internal.logging.AndroidConfig; 
import com.android.server.NetworkManagementSocketTagger;



import dalvik.system.RuntimeHooks;

import dalvik.system.ThreadPrioritySetter;

import dalvik.system.VMRuntime;



import libcore.content.type.MimeMap;
@@ -208,7 +207,6 @@ public class RuntimeInit { 
     */

    public static void preForkInit() {

        if (DEBUG) Slog.d(TAG, "Entered preForkInit.");

        RuntimeHooks.setThreadPrioritySetter(new RuntimeThreadPrioritySetter());

        RuntimeInit.enableDdms();

        // TODO(b/142019040#comment13): Decide whether to load the default instance eagerly, i.e.

        // MimeMap.setDefault(DefaultMimeMapFactory.create());
@@ -221,35 +219,6 @@ public class RuntimeInit { 
        MimeMap.setDefaultSupplier(DefaultMimeMapFactory::create);

    }



    private static class RuntimeThreadPrioritySetter implements ThreadPrioritySetter {

        // Should remain consistent with kNiceValues[] in system/libartpalette/palette_android.cc

        private static final int[] NICE_VALUES = {

            Process.THREAD_PRIORITY_LOWEST,  // 1 (MIN_PRIORITY)

            Process.THREAD_PRIORITY_BACKGROUND + 6,

            Process.THREAD_PRIORITY_BACKGROUND + 3,

            Process.THREAD_PRIORITY_BACKGROUND,

            Process.THREAD_PRIORITY_DEFAULT,  // 5 (NORM_PRIORITY)

            Process.THREAD_PRIORITY_DEFAULT - 2,

            Process.THREAD_PRIORITY_DEFAULT - 4,

            Process.THREAD_PRIORITY_URGENT_DISPLAY + 3,

            Process.THREAD_PRIORITY_URGENT_DISPLAY + 2,

            Process.THREAD_PRIORITY_URGENT_DISPLAY  // 10 (MAX_PRIORITY)

        };



        @Override

        public void setPriority(int nativeTid, int priority) {

            // Check NICE_VALUES[] length first.

            if (NICE_VALUES.length != (1 + Thread.MAX_PRIORITY - Thread.MIN_PRIORITY)) {

                throw new AssertionError("Unexpected NICE_VALUES.length=" + NICE_VALUES.length);

            }

            // Priority should be in the range of MIN_PRIORITY (1) to MAX_PRIORITY (10).

            if (priority < Thread.MIN_PRIORITY || priority > Thread.MAX_PRIORITY) {

                throw new IllegalArgumentException("Priority out of range: " + priority);

            }

            Process.setThreadPriority(nativeTid, NICE_VALUES[priority - Thread.MIN_PRIORITY]);

        }

    }



    @UnsupportedAppUsage

    protected static final void commonInit() {

        if (DEBUG) Slog.d(TAG, "Entered RuntimeInit!");