From 7edf3d3f9ae83ac72ee73bc4ebb63aea18a2b7d7 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Mon, 9 Jul 2018 15:08:03 -0700
Subject: [PATCH] Only call requestUnbind if we are connected.

Somethimes onSettingChanged can come after the connected has disconnected because
of posting message on the different thread.

Bug: 110929527
Change-Id: I09f503c2f2f437c8656d491a7fdec3ce4e82257b
---
 .../android/launcher3/notification/NotificationListener.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/notification/NotificationListener.java b/src/com/android/launcher3/notification/NotificationListener.java
index b527b6a8d2..ac5aaf8538 100644
--- a/src/com/android/launcher3/notification/NotificationListener.java
+++ b/src/com/android/launcher3/notification/NotificationListener.java
@@ -197,7 +197,7 @@ public class NotificationListener extends NotificationListenerService {
         mNotificationBadgingObserver = new SettingsObserver.Secure(getContentResolver()) {
             @Override
             public void onSettingChanged(boolean isNotificationBadgingEnabled) {
-                if (!isNotificationBadgingEnabled) {
+                if (!isNotificationBadgingEnabled && sIsConnected) {
                     requestUnbind();
                 }
             }