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

Commit fd1f6b8d authored by Julia Reynolds's avatar Julia Reynolds
Browse files

Remove obsolete flags 

Change-Id: I77fd02db3862db02e12aa3c77f9bd2901ebb7965
Test: NotificationManagerServiceTest
Bug: 311051285
Bug: 326016985
Flag: EXEMPT cleanup
parent 109a166c

core/java/android/app/notification.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -173,16 +173,6 @@ flag { 
  }

}



flag {

  name: "update_ranking_time"

  namespace: "systemui"

  description: "Updates notification sorting criteria to highlight new content while maintaining stability"

  bug: "326016985"

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}



flag {

  name: "sort_section_by_time"

  namespace: "systemui"

services/core/java/com/android/server/notification/NotificationManagerService.java

+5 −20
Original line number Diff line number Diff line
@@ -10351,16 +10351,12 @@ public class NotificationManagerService extends SystemService { 
    }















    private void scheduleListenerHintsChanged(int state) {













        if (!Flags.notificationReduceMessagequeueUsage()) {















        mHandler.removeMessages(MESSAGE_LISTENER_HINTS_CHANGED);













        }















        mHandler.obtainMessage(MESSAGE_LISTENER_HINTS_CHANGED, state, 0).sendToTarget();















    }





























    private void scheduleInterruptionFilterChanged(int listenerInterruptionFilter) {













        if (!Flags.notificationReduceMessagequeueUsage()) {















        mHandler.removeMessages(MESSAGE_LISTENER_NOTIFICATION_FILTER_CHANGED);













        }















        mHandler.obtainMessage(















                MESSAGE_LISTENER_NOTIFICATION_FILTER_CHANGED,















                listenerInterruptionFilter,










@@ -10440,31 +10436,22 @@ public class NotificationManagerService extends SystemService {













        }





























        protected void scheduleSendRankingUpdate() {













            if (Flags.notificationReduceMessagequeueUsage()) {













                Message m = Message.obtain(this, MESSAGE_SEND_RANKING_UPDATE);













                sendMessage(m);













            } else {















            if (!hasMessages(MESSAGE_SEND_RANKING_UPDATE)) {















                Message m = Message.obtain(this, MESSAGE_SEND_RANKING_UPDATE);















                sendMessage(m);















            }















        }













        }





























        protected void scheduleCancelNotification(CancelNotificationRunnable cancelRunnable,















                                                  int delay) {















            if (lifetimeExtensionRefactor()) {















                sendMessageDelayed(Message.obtain(this, cancelRunnable), delay);













            } else {













                if (Flags.notificationReduceMessagequeueUsage()) {













                    sendMessage(Message.obtain(this, cancelRunnable));















            } else {















                if (!hasCallbacks(cancelRunnable)) {















                    sendMessage(Message.obtain(this, cancelRunnable));















                }















            }















        }













        }





























        protected void scheduleOnPackageChanged(boolean removingPackage, int changeUserId,















                String[] pkgList, int[] uidList) {










@@ -10496,9 +10483,7 @@ public class NotificationManagerService extends SystemService {













        }





























        public void requestSort() {













            if (!Flags.notificationReduceMessagequeueUsage()) {















            removeMessages(MESSAGE_RANKING_SORT);













            }















            Message msg = Message.obtain();















            msg.what = MESSAGE_RANKING_SORT;















            sendMessage(msg);

































services/core/java/com/android/server/notification/flags.aconfig



+0
−7




























Original line number
Diff line number
Diff line








@@ -50,13 +50,6 @@ flag {













    bug: "312784809"















}





























flag {













  name: "notification_reduce_messagequeue_usage"













  namespace: "systemui"













  description: "When this flag is on, NMS will no longer call removeMessage() and hasCallbacks() on Handler"













  bug: "311051285"













}





























flag {















  name: "notification_test"















  namespace: "systemui"