diff --git a/api/module-lib-current.txt b/api/module-lib-current.txt
index 604af66..064d35b 100644
--- a/api/module-lib-current.txt
+++ b/api/module-lib-current.txt
@@ -338,7 +338,6 @@
     method public static String getInstructionSet(String);
     method public static dalvik.system.VMRuntime getRuntime();
     method public int getTargetSdkVersion();
-    method @FlaggedApi("com.android.libcore.niceness_api") public int getThreadNiceness(Thread);
     method public boolean is64Bit();
     method public static boolean is64BitAbi(String);
     method public static boolean is64BitInstructionSet(String);
@@ -367,7 +366,6 @@
     method public static void setProcessDataDirectory(String);
     method public static void setProcessPackageName(String);
     method public void setTargetSdkVersion(int);
-    method @FlaggedApi("com.android.libcore.niceness_api") public boolean setThreadNiceness(Thread, int);
     method public void updateProcessState(int);
     method public String vmInstructionSet();
     method public String vmLibrary();
diff --git a/libart/src/main/java/dalvik/system/VMRuntime.java b/libart/src/main/java/dalvik/system/VMRuntime.java
index a11bbe5..88cf8a3 100644
--- a/libart/src/main/java/dalvik/system/VMRuntime.java
+++ b/libart/src/main/java/dalvik/system/VMRuntime.java
@@ -28,7 +28,6 @@
 import com.android.libcore.Flags;
 
 import dalvik.annotation.compat.VersionCodes;
-import dalvik.annotation.optimization.CriticalNative;
 import dalvik.annotation.optimization.FastNative;
 
 import java.lang.ref.FinalizerReference;
@@ -802,43 +801,6 @@
     }
 
     /**
-     * Returns t's Posix niceness, as cached by {@code Thread}. Only reflects values
-     * set via java's Thread API, or via {@code setThreadNiceness()} below. Does not reflect
-     * values set directly using Posix calls in JNI code or by another process.
-     *
-     * @param t the threaad being queried
-     * @return Linux niceness value for t
-     *
-     * @hide
-     */
-    @android.annotation.FlaggedApi(com.android.libcore.Flags.FLAG_NICENESS_API)
-    @SystemApi(client = MODULE_LIBRARIES)
-    public int getThreadNiceness(Thread t) {
-      return t.getPosixNicenessInternal();
-    }
-
-    /**
-     * Sets t's Posix niceness, updating {@code Thread}'s cache. Subsequently t's
-     * Java thread priority will appear to be the nearest corresponding Java thread priority.
-     *
-     * @param t the thread whose niceness is to be set
-     * @param newNiceness new Linux niceness value, in the range of -20 to 19
-     * @return true on success. Attempts to set niceness on unstarted threads succeed
-     *         even if the deferred system call later fails.         .
-     *
-     * @hide
-     */
-    @android.annotation.FlaggedApi(com.android.libcore.Flags.FLAG_NICENESS_API)
-    @SystemApi(client = MODULE_LIBRARIES)
-    public boolean setThreadNiceness(Thread t, int newNiceness) {
-      if (newNiceness < -20 || newNiceness > 19) {
-        return false;
-      }
-      return t.setPosixNicenessInternal(newNiceness) == 0;
-    }
-
-
-    /**
      * Request that a garbage collection gets started on a different thread.
      *
      * @hide
@@ -1063,8 +1025,7 @@
      *
      * @hide
      */
-    @CriticalNative
-    public static native int getSystemDaemonNiceness();
+    public static native void setSystemDaemonThreadPriority();
 
     /**
      * Sets a callback that the runtime can call whenever a usage of a non SDK API is detected.
diff --git a/libart/src/main/java/java/lang/Daemons.java b/libart/src/main/java/java/lang/Daemons.java
index c9f0bd5..ba38844 100644
--- a/libart/src/main/java/java/lang/Daemons.java
+++ b/libart/src/main/java/java/lang/Daemons.java
@@ -125,8 +125,7 @@
                 // Thread.start() will call SetNativePriority and overwrite the desired native
                 // priority. We (may) use a native priority that doesn't have a corresponding
                 // java.lang.Thread-level priority (native priorities are more coarse-grained.)
-                Thread.currentThread().setPosixNicenessInternal(
-                    VMRuntime.getRuntime().getSystemDaemonNiceness());
+                VMRuntime.getRuntime().setSystemDaemonThreadPriority();
             }
             zygoteStartLatch.countDown();
             try {
diff --git a/libcore.aconfig b/libcore.aconfig
index 1fff8b6..51c49b7 100644
--- a/libcore.aconfig
+++ b/libcore.aconfig
@@ -135,14 +135,3 @@
     # APIs provided by a mainline module can only use a frozen flag.
     is_fixed_read_only: true
 }
-
-flag {
-    namespace: "core_libraries"
-    name: "niceness_api"
-    is_exported: true
-    description: "Java APIs get/set niceness"
-    bug: "389104950"
-    # APIs provided by a mainline module can only use a frozen flag.
-    is_fixed_read_only: true
-}
-
diff --git a/luni/src/test/java/libcore/java/lang/ThreadTest.java b/luni/src/test/java/libcore/java/lang/ThreadTest.java
index d89ff18..7b0dec9 100644
--- a/luni/src/test/java/libcore/java/lang/ThreadTest.java
+++ b/luni/src/test/java/libcore/java/lang/ThreadTest.java
@@ -179,7 +179,6 @@
         Thread thread = new Thread("starting thread") {
             @Override public void run() { try { latch.await(); } catch (Exception e) { } }
         };
-        assertEquals(Thread.currentThread().getPriority(), thread.getPriority());
         // priority set while thread was not started should carry over to started thread
         int priority = thread.getPriority() + 1;
         if (priority > Thread.MAX_PRIORITY) {
diff --git a/ojluni/annotations/hiddenapi/java/lang/Thread.java b/ojluni/annotations/hiddenapi/java/lang/Thread.java
index a7cb283..235743c 100644
--- a/ojluni/annotations/hiddenapi/java/lang/Thread.java
+++ b/ojluni/annotations/hiddenapi/java/lang/Thread.java
@@ -183,18 +183,10 @@
         throw new RuntimeException("Stub!");
     }
 
-    public final int setPosixNicenessInternal(int newNiceness) {
-        throw new RuntimeException("Stub!");
-    }
-
     public final int getPriority() {
         throw new RuntimeException("Stub!");
     }
 
-    public final int getPosixNicenessInternal() {
-        throw new RuntimeException("Stub!");
-    }
-
     public final synchronized void setName(java.lang.String name) {
         throw new RuntimeException("Stub!");
     }
@@ -327,13 +319,7 @@
         throw new RuntimeException("Stub!");
     }
 
-    native void setPriority0(int newPriority);
-
-    private native int setNiceness0(int niceness);
-
-    public static native int priorityForNiceness(int niceness);
-
-    public static native int nicenessForPriority(int priority);
+    private native void setPriority0(int newPriority);
 
     private native void interrupt0();
 
@@ -416,8 +402,6 @@
     @UnsupportedAppUsage
     private volatile long nativePeer;
 
-    private int niceness;
-
     @UnsupportedAppUsage
     volatile java.lang.Object parkBlocker;
 
diff --git a/ojluni/src/main/java/java/lang/Thread.java b/ojluni/src/main/java/java/lang/Thread.java
index e9fc480..effb7c8 100644
--- a/ojluni/src/main/java/java/lang/Thread.java
+++ b/ojluni/src/main/java/java/lang/Thread.java
@@ -26,7 +26,6 @@
 
 package java.lang;
 
-import dalvik.annotation.optimization.CriticalNative;
 import dalvik.annotation.optimization.FastNative;
 import java.lang.ref.Reference;
 import java.lang.ref.ReferenceQueue;
@@ -168,15 +167,7 @@
     // END Android-added: Android specific fields lock, nativePeer.
 
     private volatile String name;
-
-    // Android-changed: Cache Posix niceness instead of managed thread priority.
-    private int niceness;
-
-    private int priority;  // Only for reading via reflection. Avoid.
-
-    // cachedPriorityForNiceness[n + PFN_INDEX_OFFSET] = 0 or Java priority for niceness n.
-    private static final byte[] cachedPriorityForNiceness = new byte[40];
-    static final int PFN_INDEX_OFFSET = 20;
+    private int priority;
 
     /* Whether or not to single_step this thread. */
     private boolean     single_step;
@@ -567,8 +558,7 @@
 
         this.group = g;
         this.daemon = parent.isDaemon();
-        this.niceness = parent.getPosixNicenessInternal();
-        this.priority = parent.priority;
+        this.priority = parent.getPriority();
         // Android-changed: Moved into init2(Thread, boolean) helper method.
         /*
         if (security == null || isCCLOverridden(parent.getClass()))
@@ -797,7 +787,7 @@
 
     // BEGIN Android-added: Private constructor - used by the runtime.
     /** @hide */
-    Thread(ThreadGroup group, String name, int niceness, boolean daemon) {
+    Thread(ThreadGroup group, String name, int priority, boolean daemon) {
         this.group = group;
         this.group.addUnstarted();
         // Must be tolerant of threads without a name.
@@ -810,8 +800,7 @@
         // undesirable to clobber their natively set name.
         this.name = name;
 
-        this.niceness = niceness;
-        this.priority = cachingPriorityForNiceness(niceness);
+        this.priority = priority;
         this.daemon = daemon;
         init2(currentThread(), true);
         this.stackSize = 0;
@@ -1460,72 +1449,22 @@
             // Android-changed: Avoid native call if Thread is not yet started.
             // setPriority0(priority = newPriority);
             synchronized(this) {
-                this.priority = newPriority;  // Ignored by us.
+                this.priority = newPriority;
                 if (isAlive()) {
-                    this.niceness = setPriority0(newPriority);
-                } else {
-                    this.niceness = nicenessForPriority(newPriority);
+                    setPriority0(newPriority);
                 }
             }
         }
     }
 
     /**
-     * Android-added: An internal version of setPriority that takes niceness rather than priority.
-     * We do not bounds check. This does affect getPriority() calls. The results of such
-     * getPriority() will be limited to [MIN_PRIORITY, MAX_PRIORITY] even if the actual niceness
-     * value is outside that range. Such a value may be outside the ThreadGroup limit.
-     *
-     * @return  Linux errno, 0 on success or if thread has not yet been started.
-     *
-     * @hide
-     */
-    public final int setPosixNicenessInternal(int newNiceness) {
-        synchronized(this) {
-            this.niceness = newNiceness;
-            // Don't bother setting priority field here; it's only for backward compatibility, and
-            // historically we didn't set priority in this case.
-            if (isAlive()) {
-                return setNiceness0(newNiceness);
-            }
-        }
-        return 0;
-    }
-
-    /**
-     * Android-added: Fast niceness to priority conversion.
-     * Return Java priority for Posix niceness `n`, caching previously computed results.
-     */
-    private int cachingPriorityForNiceness(int n) {
-        byte[] pfn = cachedPriorityForNiceness;
-        int p = cachedPriorityForNiceness[n + PFN_INDEX_OFFSET];
-        if (p == 0) {
-            p = priorityForNiceness(n);
-            // Data race here is OK by Java rules.
-            cachedPriorityForNiceness[n + PFN_INDEX_OFFSET] = (byte) p;
-        }
-        return p;
-    }
-
-    /**
      * Returns this thread's priority.
      *
      * @return  this thread's priority.
      * @see     #setPriority
      */
     public final int getPriority() {
-        // Android-changed: Convert from stored niceness.
-        return cachingPriorityForNiceness(niceness);
-    }
-
-    /**
-     * Android-added: Access to cached niceness value.
-     * Returns this thread's cached niceness value.
-     *
-     * @hide
-     */
-    public final int getPosixNicenessInternal() {
-      return niceness;
+        return priority;
     }
 
     /**
@@ -2623,44 +2562,9 @@
 
     /* Some private helper methods */
     /**
-     * Android-changed: Make accessible to Daemons.java for internal use. Return signed niceness
-     * value corresponding to newPriority. The argument is still a Java priority.
-     *
-     * Equivalent to
-     *
-     *   int n = nicenessForPriority(newPriority);
-     *   setNiceness0(nicenessForPriority(n));
-     *   return n;
-     *
-     * But it allows us to implement Thread.setPriority() with a single native call.
+     * Android-changed: Make accessible to Daemons.java for internal use.
      */
-    native int setPriority0(int newPriority);
-
-    /**
-     * Android-added: Helper methods allowing us to understand the priority to niceness mapping,
-     * so that we can process franeworks requests trafficking in niceness as well.
-     */
-
-    /**
-     * setPriority0, but with nicenes argument and returns an errno value.
-     */
-    private native int setNiceness0(int niceness);
-
-    /**
-     * A somewhat inefficient way to map Linux niceness to Java priority. We cache the results here.
-     * @hide
-     */
-    // VisibleForTesting
-    @CriticalNative
-    public static native int priorityForNiceness(int niceness);
-
-    /**
-     * A more efficient way to map Java priority to Posix niceness.
-     * @hide
-     */
-    // VisibleForTesting
-    @CriticalNative
-    public static native int nicenessForPriority(int priority);
+    native void setPriority0(int newPriority);
 
     // BEGIN Android-removed: Native methods that are unused on Android.
     /*