Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ia47b31e49aa0635864b5e009fcb3c58e5c746a67
This commit is contained in:
TreeHugger Robot
2020-06-30 02:31:08 +00:00
committed by Automerger Merge Worker
parent 7761bc3372 12c32eb6c9
commit ea2fc73114
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/com/android/internal/app/ResolverActivity.java
View File

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