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

Commit 63eb3e5c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix StaticLayout maxLineHeight warning"

parents 0aeae36f 70ffd28d

core/java/android/text/StaticLayout.java

+4 −4
Original line number Diff line number Diff line
@@ -1327,15 +1327,15 @@ public class StaticLayout extends Layout { 
     * @hide

     */

    public int getHeight(boolean cap) {

        if (cap && mLineCount >= mMaximumVisibleLineCount && mMaxLineHeight == -1 &&

                Log.isLoggable(TAG, Log.WARN)) {

        if (cap && mLineCount > mMaximumVisibleLineCount && mMaxLineHeight == -1

                && Log.isLoggable(TAG, Log.WARN)) {

            Log.w(TAG, "maxLineHeight should not be -1. "

                    + " maxLines:" + mMaximumVisibleLineCount

                    + " lineCount:" + mLineCount);

        }



        return cap && mLineCount >= mMaximumVisibleLineCount && mMaxLineHeight != -1 ?

                mMaxLineHeight : super.getHeight();

        return cap && mLineCount > mMaximumVisibleLineCount && mMaxLineHeight != -1

                ? mMaxLineHeight : super.getHeight();

    }



    @FastNative