Merge "Sharesheet - Fix crash when suspended app is selected" into rvc-dev am: 47f3249ce1 am: 7399ecfec7

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

Change-Id: I8db5e12fca3e3c4d10c490e5cdb57d66bb81f53f

1 files changed, 10 insertions, 6 deletions

diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java
index fba4675a8c9f..233231cfcfdf 100644
--- a/core/java/com/android/internal/app/ResolverActivity.java
+++ b/core/java/com/android/internal/app/ResolverActivity.java
@@ -1279,13 +1279,17 @@ public class ResolverActivity extends Activity implements
     }
 
     private void safelyStartActivityInternal(TargetInfo cti) {
-        if (mPersonalPackageMonitor != null) {
-            mPersonalPackageMonitor.unregister();
-        }
-        if (mWorkPackageMonitor != null) {
-            mWorkPackageMonitor.unregister();
+        // If the target is suspended, the activity will not be successfully launched.
+        // Do not unregister from package manager updates in this case
+        if (!cti.isSuspended()) {
+            if (mPersonalPackageMonitor != null) {
+                mPersonalPackageMonitor.unregister();
+            }
+            if (mWorkPackageMonitor != null) {
+                mWorkPackageMonitor.unregister();
+            }
+            mRegistered = false;
         }
-        mRegistered = false;
         // If needed, show that intent is forwarded
         // from managed profile to owner or other way around.
         if (mProfileSwitchMessageId != -1) {