commit ca292596736ab8de14e5760753570e392f253e13
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jun 11 21:43:02 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 11 21:43:02 2019 +0000
tree 6e511aa06b1199b4f3820c6f05ac67e725952577
parent 6129e4737cce1590f81393f384ec66efb6a220f8
parent 8758311c2af2da1a78332f187d1461804d92a6ed

Merge "Defer listening for notification changes until resume" into ub-launcher3-qt-dev

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 57a9b16..ca410aa 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -888,7 +888,6 @@
             mLauncherCallbacks.onStart();
         }
         mAppWidgetHost.setListenIfResumed(true);
-        NotificationListener.setNotificationsChangedListener(mPopupDataProvider);
         RaceConditionTracker.onEvent(ON_START_EVT, EXIT);
     }
 
@@ -908,6 +907,9 @@
             // Refresh shortcuts if the permission changed.
             mModel.refreshShortcutsIfRequired();
 
+            // Set the notification listener and fetch updated notifications when we resume
+            NotificationListener.setNotificationsChangedListener(mPopupDataProvider);
+
             DiscoveryBounce.showForHomeIfNeeded(this);
 
             if (mPendingActivityRequestCode != -1 && isInState(NORMAL)) {