commit 84483b9d49d3b4c4f8ff72d11796e553df5cab7e
author android-build-team Robot <android-build-team-robot@google.com> Wed Jun 19 03:06:02 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Jun 19 03:06:02 2019 +0000
tree d0bba7f5e6fe372adb500fe630a368962970d0e1
parent c86a3ae970b899ea261cf3342917db10b09d8d2b
parent a13d18be19085c43f513a72366d97c1e3277455d

Snap for 5671185 from a13d18be19085c43f513a72366d97c1e3277455d to rvc-release

Change-Id: I4dc12616cf266c51e0834a21a2d2ce38e0582eca

quickstep/src/com/android/quickstep/OverviewComponentObserver.java

diff --git a/quickstep/src/com/android/quickstep/OverviewComponentObserver.java b/quickstep/src/com/android/quickstep/OverviewComponentObserver.java
index b5da836..0a73b8b 100644
--- a/quickstep/src/com/android/quickstep/OverviewComponentObserver.java
+++ b/quickstep/src/com/android/quickstep/OverviewComponentObserver.java
@@ -115,7 +115,11 @@
             // as uninstalling the app or removing the "Launcher" feature in an update).
             // Listen for package updates of this app (and remove any previously attached
             // package listener).
-            if (!defaultHome.getPackageName().equals(mUpdateRegisteredPackage)) {
+            if (defaultHome == null) {
+                if (mUpdateRegisteredPackage != null) {
+                    mContext.unregisterReceiver(mOtherHomeAppUpdateReceiver);
+                }
+            } else if (!defaultHome.getPackageName().equals(mUpdateRegisteredPackage)) {
                 if (mUpdateRegisteredPackage != null) {
                     mContext.unregisterReceiver(mOtherHomeAppUpdateReceiver);
                 }