commit 9dcc4744f03b06d32ec34e99614cc6af159d3c44
author Tony Wickham <twickham@google.com> Wed Jun 28 23:56:07 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jun 28 23:56:07 2017 +0000
tree 0bb83f229c7ba9fd5cdd3257e1f9d5aa3c1b6d22
parent b055b4b1a02366d4b5c90e00573b950f5961a60b
parent 3bf231d9aff09bc28aaf25d66cbd71d3f7ad382a

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

Change-Id: I8884964000a24a30e9f74df9954acba2892aa5f2

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();
         }
     }