From da5eebde6865ba9d2e97c5db0bf02224f91cc980 Mon Sep 17 00:00:00 2001
From: Mark Renouf <mrenouf@google.com>
Date: Tue, 5 Oct 2021 15:18:27 -0400
Subject: [PATCH] Fix NPE in onDestroy() when launched without args

The previous fix corrects startup, but crashes in
onDestroy because of null value assumed to be
initialized.

Bug: 201719995
Test: adb shell am start com.android.systemui/.usb.UsbResolverActivity
Change-Id: Ie255ece9e73db71cbb4468c59db6de79d8f659b5
---
 core/java/com/android/internal/app/ResolverActivity.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java
index b8dbfb3c64bc9..9af4f9124bc82 100644
--- 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();
         }
     }