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

Commit 70ffd28d authored by Siyamed Sinir's avatar Siyamed Sinir
Browse files

Fix StaticLayout maxLineHeight warning 

Test: atest cts/tests/tests/widget/src/android/widget/cts/TextViewTest.java
Test: atest cts/tests/tests/text/src/android/text/cts/StaticLayoutTest.java
Test: atest frameworks/base/core/tests/coretests/src/android/text/StaticLayoutTest.java
Test: Visual inspection on apk’s provided in b/28988744#3

Bug: 67678695
Change-Id: Ia2de14bc06022fd963b6cc677404906efbe8b70a
parent 11701602

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