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

2020-08-05 21:31:39 +00:00
parent 31d1d2162e 7a6365ae7e
commit b0c1ac5b2e
1 changed files with 3 additions and 1 deletions
--- a/core/java/com/android/internal/app/ChooserActivity.java
+++ b/core/java/com/android/internal/app/ChooserActivity.java
@@ -3134,7 +3134,9 @@ public class ChooserActivity extends ResolverActivity implements
        // 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
        setVerticalScrollEnabled(true);
-        mResolverDrawerLayout.scrollNestedScrollableChildBackToTop();
+        if (mResolverDrawerLayout != null) {
+            mResolverDrawerLayout.scrollNestedScrollableChildBackToTop();
+        }
    }

    @Override