Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Cleanup flag for notification memory dumps in bug reports" into udc-dev am: 0a7d7ba12c

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22616878

Change-Id: I3b4e9f5a59b0cbcded2014b23f03c7b19f6945e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jernej Virag
2023-04-13 13:44:57 +00:00
committed by Automerger Merge Worker
parent 09e5022ba2 0a7d7ba12c
commit 7ae1007fdc
2 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/flags/Flags.kt
View File

@@ -67,10 +67,6 @@ object Flags {
// TODO(b/254512538): Tracking Bug // TODO(b/254512538): Tracking Bug
val INSTANT_VOICE_REPLY = unreleasedFlag(111, "instant_voice_reply") 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 * This flag is server-controlled and should stay as [unreleasedFlag] since we never want to
* enable it on release builds. * enable it on release builds.

5
packages/SystemUI/src/com/android/systemui/statusbar/notification/init/NotificationsControllerImpl.kt
View File

@@ -20,7 +20,6 @@ import android.service.notification.StatusBarNotification
import com.android.systemui.ForegroundServiceNotificationListener import com.android.systemui.ForegroundServiceNotificationListener
import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.SysUISingleton
import com.android.systemui.flags.FeatureFlags import com.android.systemui.flags.FeatureFlags
import com.android.systemui.flags.Flags
import com.android.systemui.people.widget.PeopleSpaceWidgetManager import com.android.systemui.people.widget.PeopleSpaceWidgetManager
import com.android.systemui.plugins.statusbar.NotificationSwipeActionHelper.SnoozeOption import com.android.systemui.plugins.statusbar.NotificationSwipeActionHelper.SnoozeOption
import com.android.systemui.statusbar.NotificationListener import com.android.systemui.statusbar.NotificationListener
@@ -117,9 +116,7 @@ class NotificationsControllerImpl @Inject constructor(
notificationLogger.setUpWithContainer(listContainer) notificationLogger.setUpWithContainer(listContainer)
peopleSpaceWidgetManager.attach(notificationListener) peopleSpaceWidgetManager.attach(notificationListener)
fgsNotifListener.init() 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 // TODO: Convert all functions below this line into listeners instead of public methods