Merge "Fix bug: NullPointerException in ChooserActivity" into rvc-qpr-dev am: b0c1ac5b2e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12317069

Change-Id: I6e3d25d70fdcd2e7083199eb7b1a59d35bc41de2
This commit is contained in:
Zhen Zhang
2020-08-05 21:44:25 +00:00
committed by Automerger Merge Worker

View File

@@ -3134,8 +3134,10 @@ public class ChooserActivity extends ResolverActivity implements
// ends up disabled. That's because at some point the old tab's vertical scrolling is // ends up disabled. That's because at some point the old tab's vertical scrolling is
// disabled and the new tab's is enabled. For context, see b/159997845 // disabled and the new tab's is enabled. For context, see b/159997845
setVerticalScrollEnabled(true); setVerticalScrollEnabled(true);
if (mResolverDrawerLayout != null) {
mResolverDrawerLayout.scrollNestedScrollableChildBackToTop(); mResolverDrawerLayout.scrollNestedScrollableChildBackToTop();
} }
}
@Override @Override
protected WindowInsets onApplyWindowInsets(View v, WindowInsets insets) { protected WindowInsets onApplyWindowInsets(View v, WindowInsets insets) {