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

Commit 78e94444 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Automerger Merge Worker
Browse files

Merge changes from topic "caitlinshk-wifi-logging-split" into tm-qpr-dev am:... 

Merge changes from topic "caitlinshk-wifi-logging-split" into tm-qpr-dev am: 3800ea7c am: 17d7c688

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



Change-Id: I0a2e8318b7075fd73c6debee61c733fd33e2944d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8b6f14df 17d7c688

packages/SystemUI/ktfmt_includes.txt

+0 −2
Original line number Diff line number Diff line
@@ -451,7 +451,6 @@ 
-packages/SystemUI/src/com/android/systemui/statusbar/phone/userswitcher/StatusBarUserSwitcherController.kt

-packages/SystemUI/src/com/android/systemui/statusbar/phone/userswitcher/StatusBarUserSwitcherFeatureController.kt

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

-packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ConnectivityPipelineLogger.kt

-packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryStateNotifier.kt

-packages/SystemUI/src/com/android/systemui/statusbar/policy/DeviceControlsController.kt

-packages/SystemUI/src/com/android/systemui/statusbar/policy/DeviceControlsControllerImpl.kt
@@ -736,7 +735,6 @@ 
-packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallLoggerTest.kt

-packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/panelstate/ShadeExpansionStateManagerTest.kt

-packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/userswitcher/StatusBarUserSwitcherControllerOldImplTest.kt

-packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/shared/ConnectivityPipelineLoggerTest.kt

-packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/BatteryStateNotifierTest.kt

-packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/ClockTest.kt

-packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/DeviceControlsControllerImplTest.kt

packages/SystemUI/src/com/android/systemui/log/dagger/LogModule.java

+0 −10
Original line number Diff line number Diff line
@@ -265,16 +265,6 @@ public class LogModule { 
        return factory.create("MediaCarouselCtlrLog", 20);

    }



    /**

     * Provides a {@link LogBuffer} for use in the status bar connectivity pipeline

     */

    @Provides

    @SysUISingleton

    @StatusBarConnectivityLog

    public static LogBuffer provideStatusBarConnectivityBuffer(LogBufferFactory factory) {

        return factory.create("SbConnectivity", 64);

    }



    /** Allows logging buffers to be tweaked via adb on debug builds but not on prod builds. */

    @Provides

    @SysUISingleton

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/airplane/ui/viewmodel/AirplaneModeViewModel.kt

+10 −4
Original line number Diff line number Diff line
@@ -18,9 +18,10 @@ package com.android.systemui.statusbar.pipeline.airplane.ui.viewmodel 


import com.android.systemui.dagger.SysUISingleton

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

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

import com.android.systemui.log.table.logDiffsForTable

import com.android.systemui.statusbar.pipeline.airplane.domain.interactor.AirplaneModeInteractor

import com.android.systemui.statusbar.pipeline.shared.ConnectivityPipelineLogger

import com.android.systemui.statusbar.pipeline.shared.ConnectivityPipelineLogger.Companion.logOutputChange

import com.android.systemui.statusbar.pipeline.dagger.AirplaneTableLog

import javax.inject.Inject

import kotlinx.coroutines.CoroutineScope

import kotlinx.coroutines.flow.SharingStarted
@@ -46,7 +47,7 @@ class AirplaneModeViewModelImpl 
@Inject

constructor(

    interactor: AirplaneModeInteractor,

    logger: ConnectivityPipelineLogger,

    @AirplaneTableLog logger: TableLogBuffer,

    @Application private val scope: CoroutineScope,

) : AirplaneModeViewModel {

    override val isAirplaneModeIconVisible: StateFlow<Boolean> =
@@ -56,6 +57,11 @@ constructor( 
                isAirplaneMode && !isAirplaneIconForceHidden

            }

            .distinctUntilChanged()

            .logOutputChange(logger, "isAirplaneModeIconVisible")

            .logDiffsForTable(

                logger,

                columnPrefix = "",

                columnName = "isAirplaneModeIconVisible",

                initialValue = false,

            )

            .stateIn(scope, started = SharingStarted.WhileSubscribed(), initialValue = false)

}

packages/SystemUI/src/com/android/systemui/log/dagger/StatusBarConnectivityLog.java→packages/SystemUI/src/com/android/systemui/statusbar/pipeline/dagger/MobileInputLog.kt

+7 −17
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 The Android Open Source Project

 * 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.
@@ -14,22 +14,12 @@ 
 * limitations under the License.

 */



package com.android.systemui.log.dagger;

package com.android.systemui.statusbar.pipeline.dagger



import static java.lang.annotation.RetentionPolicy.RUNTIME;

import javax.inject.Qualifier



import com.android.systemui.plugins.log.LogBuffer;



import java.lang.annotation.Documented;

import java.lang.annotation.Retention;



import javax.inject.Qualifier;



/**

 * A {@link LogBuffer} for status bar connectivity events.

 */

/** Logs for inputs into the mobile pipeline. */

@Qualifier

@Documented

@Retention(RUNTIME)

public @interface StatusBarConnectivityLog {

}
 
@MustBeDocumented

@kotlin.annotation.Retention(AnnotationRetention.RUNTIME)

annotation class MobileInputLog

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/dagger/SharedConnectivityInputLog.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 connectivity-related inputs that are shared across wifi, mobile, etc. */

@Qualifier

@MustBeDocumented

@kotlin.annotation.Retention(AnnotationRetention.RUNTIME)

annotation class SharedConnectivityInputLog