diff --git a/api/current.txt b/api/current.txt
index 36b0fd7e346d8..58747d79dd992 100755
--- a/api/current.txt
+++ b/api/current.txt
@@ -14611,9 +14611,9 @@ package android.graphics {
     method public final boolean next(android.graphics.Rect);
   }
 
-  public class RenderNode {
+  public final class RenderNode {
+    ctor public RenderNode(java.lang.String);
     method public int computeApproximateMemoryUsage();
-    method public static android.graphics.RenderNode create(java.lang.String);
     method public void discardDisplayList();
     method public void endRecording();
     method public float getAlpha();
diff --git a/api/system-current.txt b/api/system-current.txt
index 123ca5109696b..fff53c3f13521 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -3645,9 +3645,9 @@ package android.net.wifi {
     method public boolean isPortableHotspotSupported();
     method public boolean isWifiApEnabled();
     method public boolean isWifiScannerSupported();
-    method public void registerNetworkRequestMatchCallback(android.net.wifi.WifiManager.NetworkRequestMatchCallback, android.os.Handler);
     method public boolean isWpa3SaeSupported();
     method public boolean isWpa3SuiteBSupported();
+    method public void registerNetworkRequestMatchCallback(android.net.wifi.WifiManager.NetworkRequestMatchCallback, android.os.Handler);
     method public boolean setWifiApConfiguration(android.net.wifi.WifiConfiguration);
     method public boolean startScan(android.os.WorkSource);
     method public void unregisterNetworkRequestMatchCallback(android.net.wifi.WifiManager.NetworkRequestMatchCallback);
diff --git a/graphics/java/android/graphics/RenderNode.java b/graphics/java/android/graphics/RenderNode.java
index 12128b3384bf2..45d7a2178b841 100644
--- a/graphics/java/android/graphics/RenderNode.java
+++ b/graphics/java/android/graphics/RenderNode.java
@@ -161,7 +161,7 @@ import java.lang.annotation.RetentionPolicy;
  * top-level content is desired, and finally calling {@link Surface#unlockCanvasAndPost(Canvas)}.
  * </p>
  */
-public class RenderNode {
+public final class RenderNode {
 
     // Use a Holder to allow static initialization in the boot image.
     private static class NoImagePreloadHolder {
@@ -178,6 +178,16 @@ public class RenderNode {
     private final AnimationHost mAnimationHost;
     private RecordingCanvas mCurrentRecordingCanvas;
 
+    /**
+     * Creates a new RenderNode that can be used to record batches of
+     * drawing operations, and store / apply render properties when drawn.
+     *
+     * @param name The name of the RenderNode, used for debugging purpose. May be null.
+     */
+    public RenderNode(String name) {
+        this(name, null);
+    }
+
     private RenderNode(String name, AnimationHost animationHost) {
         mNativeRenderNode = nCreate(name);
         NoImagePreloadHolder.sRegistry.registerNativeAllocation(this, mNativeRenderNode);
@@ -193,17 +203,6 @@ public class RenderNode {
         mAnimationHost = null;
     }
 
-    /**
-     * Creates a new RenderNode that can be used to record batches of
-     * drawing operations, and store / apply render properties when drawn.
-     *
-     * @param name The name of the RenderNode, used for debugging purpose. May be null.
-     * @return A new RenderNode.
-     */
-    public static @NonNull RenderNode create(@Nullable String name) {
-        return new RenderNode(name, null);
-    }
-
     /** @hide */
     public static RenderNode create(String name, @Nullable AnimationHost animationHost) {
         return new RenderNode(name, animationHost);