DEV/material-components_material-components-android
1
0
Fork 0
mirror of https://github.com/material-components/material-components-android.git synced 2026-02-20 08:39:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Snackbar] Add defensive null check for messageView.getLayout() in SnackbarContentLayout onMeasure

Browse Source 
PiperOrigin-RevId: 452776106
This commit is contained in:
dsn5ft 2022-06-03 08:58:57 -07:00 committed by pekingme
parent e9b5328490
commit e981f2f96c
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/java/com/google/android/material/snackbar/SnackbarContentLayout.java
View File

@ -20,6 +20,7 @@ import com.google.android.material.R;
import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP;
import android.content.Context;
import android.text.Layout;
import android.util.AttributeSet;
import android.view.View;
import android.widget.Button;
@ -86,7 +87,8 @@ public class SnackbarContentLayout extends LinearLayout implements ContentViewCa
getResources().getDimensionPixelSize(R.dimen.design_snackbar_padding_vertical_2lines);
final int singleLineVPadding =
getResources().getDimensionPixelSize(R.dimen.design_snackbar_padding_vertical);
final boolean isMultiLine = messageView.getLayout().getLineCount() > 1;
final Layout messageLayout = messageView.getLayout();
final boolean isMultiLine = messageLayout != null && messageLayout.getLineCount() > 1;
boolean remeasure = false;
if (isMultiLine