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

Commit 60b03ef0 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Automerger Merge Worker
Browse files

Merge "[SB Refactor] Delete ConnectivityInfoProcessor." into tm-qpr-dev am:... 

Merge "[SB Refactor] Delete ConnectivityInfoProcessor." into tm-qpr-dev am: 511de5c9 am: dfa40d2c

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



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

packages/SystemUI/ktfmt_includes.txt

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

-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/ConnectivityInfoProcessor.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/pipeline/wifi/data/model/WifiActivityModel.kt

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

+1 −2
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.systemui.log.dagger; 
import static java.lang.annotation.RetentionPolicy.RUNTIME;



import com.android.systemui.log.LogBuffer;

import com.android.systemui.statusbar.pipeline.ConnectivityInfoProcessor;



import java.lang.annotation.Documented;

import java.lang.annotation.Retention;
@@ -27,7 +26,7 @@ import java.lang.annotation.Retention; 
import javax.inject.Qualifier;



/**

 * A {@link LogBuffer} for events processed by {@link ConnectivityInfoProcessor}

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

 */

@Qualifier

@Documented

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/ConnectivityInfoProcessor.kt

deleted100644 → 0
+0 −55
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 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



import android.content.Context

import com.android.systemui.CoreStartable

import com.android.systemui.dagger.SysUISingleton

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

import com.android.systemui.statusbar.pipeline.wifi.ui.viewmodel.WifiViewModel

import javax.inject.Inject

import javax.inject.Provider

import kotlinx.coroutines.CoroutineScope

import kotlinx.coroutines.flow.collect

import kotlinx.coroutines.launch



/**

 * A temporary object that collects on [WifiViewModel] flows for debugging purposes.

 *

 * This will eventually get migrated to a view binder that will use the flow outputs to set state on

 * views. For now, this just collects on flows so that the information gets logged.

 */

@SysUISingleton

class ConnectivityInfoProcessor @Inject constructor(

        context: Context,

        // TODO(b/238425913): Don't use the application scope; instead, use the status bar view's

        // scope so we only do work when there's UI that cares about it.

        @Application private val scope: CoroutineScope,

        private val statusBarPipelineFlags: StatusBarPipelineFlags,

        private val wifiViewModelProvider: Provider<WifiViewModel>,

) : CoreStartable(context) {

    override fun start() {

        if (!statusBarPipelineFlags.isNewPipelineBackendEnabled()) {

            return

        }

        // TODO(b/238425913): The view binder should do this instead. For now, do it here so we can

        // see the logs.

        scope.launch {

            wifiViewModelProvider.get().isActivityInVisible.collect { }

        }

    }

}

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

+0 −10
Original line number Diff line number Diff line
@@ -16,25 +16,15 @@ 


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



import com.android.systemui.CoreStartable

import com.android.systemui.statusbar.pipeline.ConnectivityInfoProcessor

import com.android.systemui.statusbar.pipeline.shared.data.repository.ConnectivityRepository

import com.android.systemui.statusbar.pipeline.shared.data.repository.ConnectivityRepositoryImpl

import com.android.systemui.statusbar.pipeline.wifi.data.repository.WifiRepository

import com.android.systemui.statusbar.pipeline.wifi.data.repository.WifiRepositoryImpl

import dagger.Binds

import dagger.Module

import dagger.multibindings.ClassKey

import dagger.multibindings.IntoMap



@Module

abstract class StatusBarPipelineModule {

    /** Inject into ConnectivityInfoProcessor. */

    @Binds

    @IntoMap

    @ClassKey(ConnectivityInfoProcessor::class)

    abstract fun bindConnectivityInfoProcessor(cip: ConnectivityInfoProcessor): CoreStartable



    @Binds

    abstract fun connectivityRepository(impl: ConnectivityRepositoryImpl): ConnectivityRepository