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

Commit 305f0ea7 authored by Jernej Virag's avatar Jernej Virag Committed by Automerger Merge Worker
Browse files

Merge changes If58bf46a,I6b378499 into udc-qpr-dev am: 9a5214d9 am: e0d8e395 

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



Change-Id: I0984d473045802ddf11d6dca175436d2def5d86b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 609d68a7 e0d8e395

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

+4 −3
Original line number Diff line number Diff line
@@ -62,11 +62,12 @@ object Flags { 
    val INSTANT_VOICE_REPLY = unreleasedFlag(111, "instant_voice_reply")



    /**

     * This flag is server-controlled and should stay as [unreleasedFlag] since we never want to

     * enable it on release builds.

     * This flag controls whether we register a listener for StatsD notification memory reports.

     * For statsd to actually call the listener however, a server-side toggle needs to be

     * enabled as well.

     */

    val NOTIFICATION_MEMORY_LOGGING_ENABLED =

        unreleasedFlag(119, "notification_memory_logging_enabled")

            releasedFlag(119, "notification_memory_logging_enabled")



    // TODO(b/260335638): Tracking Bug

    @JvmField

packages/SystemUI/src/com/android/systemui/statusbar/notification/dagger/NotificationMemoryModule.kt

0 → 100644
+33 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package com.android.systemui.statusbar.notification.dagger



import com.android.systemui.CoreStartable

import com.android.systemui.statusbar.notification.logging.NotificationMemoryMonitor

import dagger.Binds

import dagger.Module

import dagger.multibindings.ClassKey

import dagger.multibindings.IntoMap



@Module

interface NotificationMemoryModule {



    /** Binds memory monitor into startable map. */

    @Binds

    @IntoMap

    @ClassKey(NotificationMemoryMonitor::class)

    fun bindsNotificationMemoryMonitorStartable(monitor: NotificationMemoryMonitor): CoreStartable

}

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

+0 −3
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ import com.android.systemui.statusbar.notification.collection.notifcollection.No 
import com.android.systemui.statusbar.notification.collection.render.NotifStackController

import com.android.systemui.statusbar.notification.interruption.HeadsUpViewBinder

import com.android.systemui.statusbar.notification.logging.NotificationLogger

import com.android.systemui.statusbar.notification.logging.NotificationMemoryMonitor

import com.android.systemui.statusbar.notification.row.NotifBindPipelineInitializer

import com.android.systemui.statusbar.notification.stack.NotificationListContainer

import com.android.wm.shell.bubbles.Bubbles
@@ -72,7 +71,6 @@ class NotificationsControllerImpl @Inject constructor( 
    private val peopleSpaceWidgetManager: PeopleSpaceWidgetManager,

    private val bubblesOptional: Optional<Bubbles>,

    private val fgsNotifListener: ForegroundServiceNotificationListener,

    private val memoryMonitor: Lazy<NotificationMemoryMonitor>,

    private val featureFlags: FeatureFlags

) : NotificationsController {
@@ -108,7 +106,6 @@ class NotificationsControllerImpl @Inject constructor( 
        notificationLogger.setUpWithContainer(listContainer)

        peopleSpaceWidgetManager.attach(notificationListener)

        fgsNotifListener.init()

        memoryMonitor.get().init()

    }



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

packages/SystemUI/src/com/android/systemui/statusbar/notification/logging/NotificationMemoryMonitor.kt

+3 −2
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
package com.android.systemui.statusbar.notification.logging



import android.util.Log

import com.android.systemui.CoreStartable

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.flags.FeatureFlags

import com.android.systemui.flags.Flags
@@ -32,13 +33,13 @@ constructor( 
    private val featureFlags: FeatureFlags,

    private val notificationMemoryDumper: NotificationMemoryDumper,

    private val notificationMemoryLogger: Lazy<NotificationMemoryLogger>,

) {

) : CoreStartable {



    companion object {

        private const val TAG = "NotificationMemory"

    }



    fun init() {

    override fun start() {

        Log.d(TAG, "NotificationMemoryMonitor initialized.")

        notificationMemoryDumper.init()

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