commit 3bf231d9aff09bc28aaf25d66cbd71d3f7ad382a
author Tony Wickham <twickham@google.com> Wed Jun 28 23:49:22 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 28 23:49:22 2017 +0000
tree 0df1955d3e35af907023291bdda58229d69c6792
parent 15d72f253810a8c7f54de7633dc3068130ec0600
parent cba189344d82753ccce0cc5479771c5a78e85c56

Merge "Ensure notification listener is connected before getting notifications" into ub-launcher3-dorval-polish

src/com/android/launcher3/notification/NotificationListener.java

diff --git a/src/com/android/launcher3/notification/NotificationListener.java b/src/com/android/launcher3/notification/NotificationListener.java
index baaa66a..8121fd5 100644
--- a/src/com/android/launcher3/notification/NotificationListener.java
+++ b/src/com/android/launcher3/notification/NotificationListener.java
@@ -127,8 +127,9 @@
         }
         sNotificationsChangedListener = listener;
 
-        if (sNotificationListenerInstance != null) {
-            sNotificationListenerInstance.onNotificationFullRefresh();
+        NotificationListener notificationListener = getInstanceIfConnected();
+        if (notificationListener != null) {
+            notificationListener.onNotificationFullRefresh();
         }
     }