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

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

Change-Id: I7918ddcfce3e5d4d8e2956cfa5ba586fc03a7831
This commit is contained in:
TreeHugger Robot
2020-06-30 02:18:38 +00:00
committed by Automerger Merge Worker
parent fbc2433fc0 7399ecfec7
commit 46d9fddee8
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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) {