Merge "Sharesheet - Fix crash when suspended app is selected" into rvc-dev (47f3249c) · Commits · e / os / android_frameworks_base

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

+10 −6

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

	private void safelyStartActivityInternal(TargetInfo cti) {		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) {		if (mPersonalPackageMonitor != null) {
	mPersonalPackageMonitor.unregister();		mPersonalPackageMonitor.unregister();
	}		}
	@@ -1286,6 +1289,7 @@ public class ResolverActivity extends Activity implements
	mWorkPackageMonitor.unregister();		mWorkPackageMonitor.unregister();
	}		}
	mRegistered = false;		mRegistered = false;
			}
	// If needed, show that intent is forwarded		// If needed, show that intent is forwarded
	// from managed profile to owner or other way around.		// from managed profile to owner or other way around.
	if (mProfileSwitchMessageId != -1) {		if (mProfileSwitchMessageId != -1) {