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

Commit 416bbd90 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[SB Refactor] Define a MobileViewLogger and move the UI logs there. 

Future CLs will add more view-related logging to this logger. So, it
makes sense to have separate buffers for input and view.

This also moves MobileInputLogger to the data layer, since it's now only
accessed from there.

Bug: 267236367
Test: atest MobileInputLoggerTest
Test: `adb shell dumpsys activity service
com.android.systemui/.SystemUIService MobileViewLog` -> dumps UI adapter
logs

Change-Id: I5e7eb52c54e18a1c7adc735e7e49b32c0bd570d2
parent a784c33e

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/dagger/MobileViewLog.kt

0 → 100644
+25 −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.pipeline.dagger



import javax.inject.Qualifier



/** Logs for changes with the new mobile views. */

@Qualifier

@MustBeDocumented

@kotlin.annotation.Retention(AnnotationRetention.RUNTIME)

annotation class MobileViewLog

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/dagger/StatusBarPipelineModule.kt

+7 −0
Original line number Diff line number Diff line
@@ -148,5 +148,12 @@ abstract class StatusBarPipelineModule { 
        fun provideMobileInputLogBuffer(factory: LogBufferFactory): LogBuffer {

            return factory.create("MobileInputLog", 100)

        }



        @Provides

        @SysUISingleton

        @MobileViewLog

        fun provideMobileViewLogBuffer(factory: LogBufferFactory): LogBuffer {

            return factory.create("MobileViewLog", 100)

        }

    }

}

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/shared/MobileInputLogger.kt→packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/MobileInputLogger.kt

+1 −19
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.systemui.statusbar.pipeline.mobile.shared

package com.android.systemui.statusbar.pipeline.mobile.data



import android.net.Network

import android.net.NetworkCapabilities
@@ -133,24 +133,6 @@ constructor( 
        )

    }



    fun logUiAdapterSubIdsUpdated(subs: List<Int>) {

        buffer.log(

            TAG,

            LogLevel.INFO,

            { str1 = subs.toString() },

            { "Sub IDs in MobileUiAdapter updated internally: $str1" },

        )

    }



    fun logUiAdapterSubIdsSentToIconController(subs: List<Int>) {

        buffer.log(

            TAG,

            LogLevel.INFO,

            { str1 = subs.toString() },

            { "Sub IDs in MobileUiAdapter being sent to icon controller: $str1" },

        )

    }



    fun logCarrierConfigChanged(subId: Int) {

        buffer.log(

            TAG,

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/CarrierConfigRepository.kt

+1 −1
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ import com.android.systemui.broadcast.BroadcastDispatcher 
import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.qualifiers.Application

import com.android.systemui.dump.DumpManager

import com.android.systemui.statusbar.pipeline.mobile.data.MobileInputLogger

import com.android.systemui.statusbar.pipeline.mobile.data.model.SystemUiCarrierConfig

import com.android.systemui.statusbar.pipeline.mobile.shared.MobileInputLogger

import java.io.PrintWriter

import javax.inject.Inject

import kotlinx.coroutines.CoroutineScope

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionRepositoryImpl.kt

+1 −1
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCall 
import com.android.systemui.dagger.qualifiers.Application

import com.android.systemui.dagger.qualifiers.Background

import com.android.systemui.log.table.TableLogBuffer

import com.android.systemui.statusbar.pipeline.mobile.data.MobileInputLogger

import com.android.systemui.statusbar.pipeline.mobile.data.model.MobileConnectionModel

import com.android.systemui.statusbar.pipeline.mobile.data.model.NetworkNameModel

import com.android.systemui.statusbar.pipeline.mobile.data.model.ResolvedNetworkType.DefaultNetworkType
@@ -47,7 +48,6 @@ import com.android.systemui.statusbar.pipeline.mobile.data.model.toNetworkNameMo 
import com.android.systemui.statusbar.pipeline.mobile.data.repository.CarrierConfigRepository

import com.android.systemui.statusbar.pipeline.mobile.data.repository.MobileConnectionRepository

import com.android.systemui.statusbar.pipeline.mobile.data.repository.MobileConnectionRepository.Companion.DEFAULT_NUM_LEVELS

import com.android.systemui.statusbar.pipeline.mobile.shared.MobileInputLogger

import com.android.systemui.statusbar.pipeline.mobile.util.MobileMappingsProxy

import com.android.systemui.statusbar.pipeline.shared.data.model.toMobileDataActivityModel

import javax.inject.Inject