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

Browse Source
This commit is contained in:
TreeHugger Robot
2020-06-30 01:46:20 +00:00
committed by Android (Google) Code Review
parent 8e47723834 406a5a9331
commit 47f3249ce1
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) { private void safelyStartActivityInternal(TargetInfo cti) {
if (mPersonalPackageMonitor != null) { // If the target is suspended, the activity will not be successfully launched.
mPersonalPackageMonitor.unregister(); // 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 // 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) {