Merge "Fix NPE in onDestroy() when launched without args"

2021-10-06 15:32:28 +00:00
parent 638e4594a3 da5eebde68
commit 54fef7af80
1 changed files with 2 additions and 1 deletions
--- a/core/java/com/android/internal/app/ResolverActivity.java
+++ b/core/java/com/android/internal/app/ResolverActivity.java
@@ -901,7 +901,8 @@ public class ResolverActivity extends Activity implements
        if (!isChangingConfigurations() && mPickOptionRequest != null) {
            mPickOptionRequest.cancel();
        }
-        if (mMultiProfilePagerAdapter.getActiveListAdapter() != null) {
+        if (mMultiProfilePagerAdapter != null
+                && mMultiProfilePagerAdapter.getActiveListAdapter() != null) {
            mMultiProfilePagerAdapter.getActiveListAdapter().onDestroy();
        }
    }