diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 992b996170644..4b127bd246fc6 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -19413,7 +19413,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
      * @param info the {@link android.view.View.AttachInfo} to associated with
      *        this view
      */
-    @UnsupportedAppUsage
+    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
     void dispatchAttachedToWindow(AttachInfo info, int visibility) {
         mAttachInfo = info;
         if (mOverlay != null) {
@@ -19479,7 +19479,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
         notifyAppearedOrDisappearedForContentCaptureIfNeeded(true);
     }
 
-    @UnsupportedAppUsage
+    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
     void dispatchDetachedFromWindow() {
         AttachInfo info = mAttachInfo;
         if (info != null) {