Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28e5463b authored by Paul Duffin's avatar Paul Duffin Committed by Android (Google) Code Review
Browse files

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

parents 1b4ee5b8 4fb97d10

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -47213,7 +47213,7 @@ package android.text { 
    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

+0 −1
Original line number Diff line number Diff line
@@ -3913,7 +3913,6 @@ public abstract class Layout { 
     * @see Layout.Builder

     */

    @NonNull

    @FlaggedApi(FLAG_USE_BOUNDS_FOR_WIDTH)

    public final CharSequence getText() {

        return mText;

    }