Merge "Restrict unsupported API usage to View.setFrame"

2 files changed, 3 insertions, 3 deletions

diff --git a/api/current.txt b/api/current.txt
index 42b70aadb571..52ab61057c88 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -49341,7 +49341,7 @@ package android.view {
     method public void setLayoutDirection(int);
     method public void setLayoutParams(android.view.ViewGroup.LayoutParams);
     method public final void setLeft(int);
-    method public void setLeftTopRightBottom(int, int, int, int);
+    method public final void setLeftTopRightBottom(int, int, int, int);
     method public void setLongClickable(boolean);
     method protected final void setMeasuredDimension(int, int);
     method public void setMinimumHeight(int);
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 6dfdd2245c38..c5d03741dbba 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -21462,7 +21462,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
      *         previous ones
      * {@hide}
      */
-    @UnsupportedAppUsage
+    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
     protected boolean setFrame(int left, int top, int right, int bottom) {
         boolean changed = false;
 
@@ -21539,7 +21539,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
      *
      * @see #setLeft(int), #setRight(int), #setTop(int), #setBottom(int)
      */
-    public void setLeftTopRightBottom(int left, int top, int right, int bottom) {
+    public final void setLeftTopRightBottom(int left, int top, int right, int bottom) {
         setFrame(left, top, right, bottom);
     }