commit 0611abd2b8cfae8661023783a3dcd4dfadc9e098
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Sep 09 17:01:19 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 09 17:01:19 2024 +0000
tree 4e1bf8d2d530e845726cc68f33411ec8e9439e3b
parent 1490cab2e3988a98c86d59f6aa2eba821b50ca37
parent 999c9eacabb1f4eafecc999adb8a31429e25eb7c

Merge "Make the long-deprecated detachDrawGlFunctor a no-op." into main

core/java/android/webkit/WebViewDelegate.java

diff --git a/core/java/android/webkit/WebViewDelegate.java b/core/java/android/webkit/WebViewDelegate.java
index 8501474..4c5802c 100644
--- a/core/java/android/webkit/WebViewDelegate.java
+++ b/core/java/android/webkit/WebViewDelegate.java
@@ -137,9 +137,13 @@
      */
     @Deprecated
     public void detachDrawGlFunctor(View containerView, long nativeDrawGLFunctor) {
-        ViewRootImpl viewRootImpl = containerView.getViewRootImpl();
-        if (nativeDrawGLFunctor != 0 && viewRootImpl != null) {
-            viewRootImpl.detachFunctor(nativeDrawGLFunctor);
+        if (Flags.mainlineApis()) {
+            throw new UnsupportedOperationException();
+        } else {
+            ViewRootImpl viewRootImpl = containerView.getViewRootImpl();
+            if (nativeDrawGLFunctor != 0 && viewRootImpl != null) {
+                viewRootImpl.detachFunctor(nativeDrawGLFunctor);
+            }
         }
     }