Skip to content

Commit 475e63b

Browse files
wcshidsn5ft
authored andcommitted
[MaterialCardView] Fixed NPE if android:onClick is defined in the layout
Resolves #1054 Resolves #1614 GIT_ORIGIN_REV_ID=b19044de3093f19313e362d378f5cc3b810c5727 PiperOrigin-RevId: 326486876 (cherry picked from commit 1b0cfae)
1 parent 53d49e3 commit 475e63b

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

lib/java/com/google/android/material/card/MaterialCardView.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,9 @@ public ColorStateList getCardForegroundColor() {
312312
@Override
313313
public void setClickable(boolean clickable) {
314314
super.setClickable(clickable);
315-
cardViewHelper.updateClickable();
315+
if (cardViewHelper != null){
316+
cardViewHelper.updateClickable();
317+
}
316318
}
317319

318320
@Override

0 commit comments

Comments
 (0)