From a67424cf9637d1ebcb2dcac50c3696de54889ebd Mon Sep 17 00:00:00 2001
From: Zhuying Li <vend_wsd_am_027@mediatek.com>
Date: Tue, 28 Jul 2020 15:48:42 +0800
Subject: [PATCH] Unregistering PackageMonitor only when has registered it

Do not unregistering PackageMonitor when it does not register.

Bug: 162302943
Change-Id: I9496196e80bff8b669539c9c54d39dbbf6ad2dba
---
 core/java/com/android/internal/app/ResolverActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java
index 233231cfcfdf0..16991b472037c 100644
--- a/core/java/com/android/internal/app/ResolverActivity.java
+++ b/core/java/com/android/internal/app/ResolverActivity.java
@@ -1281,7 +1281,7 @@ 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 (!cti.isSuspended() && mRegistered) {
             if (mPersonalPackageMonitor != null) {
                 mPersonalPackageMonitor.unregister();
             }