From 9b0a6c636525b2f698f87bea11e547e9531a4f01 Mon Sep 17 00:00:00 2001 From: Jernej Virag Date: Thu, 13 Apr 2023 10:36:40 +0200 Subject: [PATCH] Cleanup flag for notification memory dumps in bug reports This cleans up the released flag which adds notification memory use to bug dump reports. This flag has been released since QPR2 and no bugs were found within the code. (statsd logging is still flag protected with a different flag) Bug: 254512425 Change-Id: Ie2048f3d74f38dd689663f1641410932cfe7d92d Test: Unit tests --- packages/SystemUI/src/com/android/systemui/flags/Flags.kt | 4 ---- .../notification/init/NotificationsControllerImpl.kt | 5 +---- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt index f01749a6c031b..dfe86970190ce 100644 --- a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt +++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt @@ -67,10 +67,6 @@ object Flags { // TODO(b/254512538): Tracking Bug val INSTANT_VOICE_REPLY = unreleasedFlag(111, "instant_voice_reply") - // TODO(b/254512425): Tracking Bug - val NOTIFICATION_MEMORY_MONITOR_ENABLED = - releasedFlag(112, "notification_memory_monitor_enabled") - /** * This flag is server-controlled and should stay as [unreleasedFlag] since we never want to * enable it on release builds. diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/init/NotificationsControllerImpl.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/init/NotificationsControllerImpl.kt index 8eef3f36433d1..0ed41758f215d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/init/NotificationsControllerImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/init/NotificationsControllerImpl.kt @@ -20,7 +20,6 @@ import android.service.notification.StatusBarNotification import com.android.systemui.ForegroundServiceNotificationListener import com.android.systemui.dagger.SysUISingleton import com.android.systemui.flags.FeatureFlags -import com.android.systemui.flags.Flags import com.android.systemui.people.widget.PeopleSpaceWidgetManager import com.android.systemui.plugins.statusbar.NotificationSwipeActionHelper.SnoozeOption import com.android.systemui.statusbar.NotificationListener @@ -117,9 +116,7 @@ class NotificationsControllerImpl @Inject constructor( notificationLogger.setUpWithContainer(listContainer) peopleSpaceWidgetManager.attach(notificationListener) fgsNotifListener.init() - if (featureFlags.isEnabled(Flags.NOTIFICATION_MEMORY_MONITOR_ENABLED)) { - memoryMonitor.get().init() - } + memoryMonitor.get().init() } // TODO: Convert all functions below this line into listeners instead of public methods