Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 334cc675 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I2e500ae4440bded0dcbdfae2e81ced6a96f92728
parents faebbe78 47f3249c

core/java/com/android/internal/app/ResolverActivity.java

+10 −6
Original line number Diff line number Diff line
@@ -1279,6 +1279,9 @@ public class ResolverActivity extends Activity implements 
    }



    private void safelyStartActivityInternal(TargetInfo cti) {

        // 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();

            }
@@ -1286,6 +1289,7 @@ public class ResolverActivity extends Activity implements 
                mWorkPackageMonitor.unregister();

            }

            mRegistered = false;

        }

        // If needed, show that intent is forwarded

        // from managed profile to owner or other way around.

        if (mProfileSwitchMessageId != -1) {