commit 4fb97d10039de9b13a247f9006430f9ae5dc5ae8
author Paul Duffin <paulduffin@google.com> Thu Nov 30 22:31:53 2023 +0000
committer Paul Duffin <paulduffin@google.com> Fri Dec 01 00:12:04 2023 +0000
tree 51aef811eacedd53d1042d7c2f58138a1ea411ae
parent 9b59e8337ecef53ed457fa042f8575f364ff5c73

Remove unnecessary FlaggedApi annotation from Layout.getText()

The `FlaggedApi` annotation must only be used for new APIs but
`Layout.getText()` has been in the public API since Android was first
checked into Android.

Bug: 304989985
Test: m checkapi
Change-Id: I7ae98f9495abffa1e483cae86c8d6f6ae2a400d9

core/api/current.txt

diff --git a/core/api/current.txt b/core/api/current.txt
index 5e7a383..3997279 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -47195,7 +47195,7 @@
     method public void getSelectionPath(int, int, android.graphics.Path);
     method public final float getSpacingAdd();
     method public final float getSpacingMultiplier();
-    method @FlaggedApi("com.android.text.flags.use_bounds_for_width") @NonNull public final CharSequence getText();
+    method @NonNull public final CharSequence getText();
     method @FlaggedApi("com.android.text.flags.use_bounds_for_width") @NonNull public final android.text.TextDirectionHeuristic getTextDirectionHeuristic();
     method public abstract int getTopPadding();
     method @FlaggedApi("com.android.text.flags.use_bounds_for_width") public boolean getUseBoundsForWidth();

core/java/android/text/Layout.java

diff --git a/core/java/android/text/Layout.java b/core/java/android/text/Layout.java
index 47c29d9..89aceb9 100644
--- a/core/java/android/text/Layout.java
+++ b/core/java/android/text/Layout.java
@@ -3913,7 +3913,6 @@
      * @see Layout.Builder
      */
     @NonNull
-    @FlaggedApi(FLAG_USE_BOUNDS_FOR_WIDTH)
     public final CharSequence getText() {
         return mText;
     }