Merge "Use hasSentValidBubble in settings"

src/com/android/settings/notification/NotificationBackend.java

@@ -361,6 +361,15 @@ public class NotificationBackend {
         }
     }
 
+    public boolean hasSentValidBubble(String pkg, int uid) {
+        try {
+            return sINM.hasSentValidBubble(pkg, uid);
+        } catch (Exception e) {
+            Log.w(TAG, "Error calling NoMan", e);
+            return false;
+        }
+    }
+
     /**
      * Returns all notification channels associated with the package and uid that will bypass DND
      */

src/com/android/settings/notification/app/BubbleSummaryPreferenceController.java

@@ -63,7 +63,7 @@ public class BubbleSummaryPreferenceController extends NotificationPreferenceCon
                 return mAppRow != null;
             }
         }
-        return isGloballyEnabled() && mBackend.hasSentValidMsg(mAppRow.pkg, mAppRow.uid);
+        return isGloballyEnabled() && mBackend.hasSentValidBubble(mAppRow.pkg, mAppRow.uid);
     }
 
     @Override