Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92d75db8 authored by Steve Elliott's avatar Steve Elliott
Browse files

Remove unused BubblesManager#maybeCancelSummary() 

Bug: 145659174
Test: atest SystemUITests
Change-Id: Ibeee6718452e2c0fbff3a5dd611c535ff90f59d2
parent 2e342598

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java

+0 −12
Original line number Diff line number Diff line
@@ -1336,19 +1336,7 @@ public class BubbleController implements ConfigurationChangeListener { 
                        }

                        mSysuiProxy.updateNotificationBubbleButton(bubble.getKey());

                    }



                }

                mSysuiProxy.getPendingOrActiveEntry(bubble.getKey(), (entry) -> {

                    mMainExecutor.execute(() -> {

                        if (entry != null) {

                            final String groupKey = entry.getStatusBarNotification().getGroupKey();

                            if (getBubblesInGroup(groupKey).isEmpty()) {

                                // Time to potentially remove the summary

                                mSysuiProxy.notifyMaybeCancelSummary(bubble.getKey());

                            }

                }

                    });

                });

            }

            mDataRepository.removeBubbles(mCurrentUserId, bubblesToBeRemovedFromRepository);

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/Bubbles.java

+0 −2
Original line number Diff line number Diff line
@@ -276,8 +276,6 @@ public interface Bubbles { 


        void notifyInvalidateNotifications(String reason);



        void notifyMaybeCancelSummary(String key);



        void updateNotificationBubbleButton(String key);



        void onStackExpandChanged(boolean shouldExpand);

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/BubbleCoordinator.java

+0 −5
Original line number Diff line number Diff line
@@ -144,11 +144,6 @@ public class BubbleCoordinator implements Coordinator { 
        public void invalidateNotifications(String reason) {

            mNotifFilter.invalidateList(reason);

        }



        @Override

        public void maybeCancelSummary(NotificationEntry entry) {

            // no-op

        }

    };



    private boolean isInterceptingDismissal(NotificationEntry entry) {

packages/SystemUI/src/com/android/systemui/wmshell/BubblesManager.java

+0 −22
Original line number Diff line number Diff line
@@ -310,18 +310,6 @@ public class BubblesManager { 
                });

            }



            @Override

            public void notifyMaybeCancelSummary(String key) {

                sysuiMainExecutor.execute(() -> {

                    final NotificationEntry entry = mCommonNotifCollection.getEntry(key);

                    if (entry != null) {

                        for (NotifCallback cb : mCallbacks) {

                            cb.maybeCancelSummary(entry);

                        }

                    }

                });

            }



            @Override

            public void updateNotificationBubbleButton(String key) {

                sysuiMainExecutor.execute(() -> {
@@ -646,15 +634,5 @@ public class BubblesManager { 
         * filtered from the shade.

         */

        void invalidateNotifications(@NonNull String reason);



        /**

         * Called on a bubbled entry that has been removed when there are no longer

         * bubbled entries in its group.

         *

         * Checks whether its group has any other (non-bubbled) children. If it doesn't,

         * removes all remnants of the group's summary from the notification pipeline.

         * TODO: (b/145659174) Only old pipeline needs this - delete post-migration.

         */

        void maybeCancelSummary(@NonNull NotificationEntry entry);

    }

}