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

Commit 7b50e99b authored by Jernej Virag's avatar Jernej Virag Committed by Automerger Merge Worker
Browse files

Merge "Cleanup flag for notification memory dumps in bug reports" into udc-dev... 

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

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



Change-Id: I700da5c37b9a16bac515a4b6d35e9f5d1789b86d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f6dfbcab b0d1a5b9

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+0 −4
Original line number Diff line number Diff line
@@ -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.

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

+1 −4
Original line number Diff line number Diff line
@@ -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,10 +116,8 @@ class NotificationsControllerImpl @Inject constructor( 
        notificationLogger.setUpWithContainer(listContainer)

        peopleSpaceWidgetManager.attach(notificationListener)

        fgsNotifListener.init()

        if (featureFlags.isEnabled(Flags.NOTIFICATION_MEMORY_MONITOR_ENABLED)) {

        memoryMonitor.get().init()

    }

    }



    // TODO: Convert all functions below this line into listeners instead of public methods