Skip to content

Commit 267d79f

Browse files
wcshidsn5ft
authored andcommitted
Add null check so that TabelLayoutMediator.detach can be called more than once without causing NPE.
Resolves #804 PiperOrigin-RevId: 284976120 (cherry picked from commit 7461eda)
1 parent 88a67b0 commit 267d79f

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

lib/java/com/google/android/material/tabs/TabLayoutMediator.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,9 @@ public void attach() {
136136
* called before {@link #attach()} when a ViewPager2's adapter is changed.
137137
*/
138138
public void detach() {
139-
adapter.unregisterAdapterDataObserver(pagerAdapterObserver);
139+
if (adapter != null) {
140+
adapter.unregisterAdapterDataObserver(pagerAdapterObserver);
141+
}
140142
tabLayout.removeOnTabSelectedListener(onTabSelectedListener);
141143
viewPager.unregisterOnPageChangeCallback(onPageChangeCallback);
142144
pagerAdapterObserver = null;

0 commit comments

Comments
 (0)