commit 28e5463be0e0ed5dc1a64ff87cfb84676ee1ac13
author Paul Duffin <paulduffin@google.com> Fri Dec 01 01:38:07 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Dec 01 01:38:07 2023 +0000
tree 979ba7ba0ed17125457cd4d682c4afd3571bc871
parent 1b4ee5b8307ddc6039cbe33b4136b713760f2069
parent 4fb97d10039de9b13a247f9006430f9ae5dc5ae8

Merge "Remove unnecessary FlaggedApi annotation from Layout.getText()" into main

core/api/current.txt

diff --git a/core/api/current.txt b/core/api/current.txt
index 9a33dba..bbdb0a1 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -47213,7 +47213,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;
     }