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

Commit 67f6b960 authored Dec 20, 2023 by Ioana Alexandru

Move LogBufferHelper to SystemUITestUtils.

This will allow us to use it in kosmos fixtures without needing to
add new dependencies.

Also moved it to the log package instead of dump since I felt it was a
better fit (and it saves some import statements).

Bug: 293167744
Test: builds
Flag: N/A

Change-Id: Ica0a45b1f593b47247eb4235554b5440b85b5df1

parent bdd5448d

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/data/repository/DeviceEntryFaceAuthRepositoryTest.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -56,7 +56,6 @@ import com.android.systemui.coroutines.collectValues
		import com.android.systemui.display.data.repository.FakeDisplayRepository
		import com.android.systemui.display.data.repository.display
		import com.android.systemui.dump.DumpManager
		import com.android.systemui.dump.logcatLogBuffer
		import com.android.systemui.flags.FakeFeatureFlags
		import com.android.systemui.flags.Flags.KEYGUARD_WM_STATE_REFACTOR
		import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor
		@@ -73,6 +72,7 @@ import com.android.systemui.keyguard.shared.model.TransitionState
		import com.android.systemui.keyguard.shared.model.TransitionStep
		import com.android.systemui.log.FaceAuthenticationLogger
		import com.android.systemui.log.SessionTracker
		import com.android.systemui.log.logcatLogBuffer
		import com.android.systemui.log.table.TableLogBuffer
		import com.android.systemui.plugins.statusbar.StatusBarStateController
		import com.android.systemui.power.data.repository.FakePowerRepository

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/base/logging/QSTileLoggerTest.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -21,9 +21,9 @@ import androidx.test.filters.SmallTest
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.common.shared.model.ContentDescription
		import com.android.systemui.common.shared.model.Icon
		import com.android.systemui.dump.LogcatEchoTrackerAlways
		import com.android.systemui.log.LogBuffer
		import com.android.systemui.log.LogBufferFactory
		import com.android.systemui.log.LogcatEchoTrackerAlways
		import com.android.systemui.plugins.statusbar.StatusBarStateController
		import com.android.systemui.qs.pipeline.shared.TileSpec
		import com.android.systemui.qs.tiles.viewmodel.QSTileState

packages/SystemUI/tests/src/com/android/keyguard/CarrierTextManagerTest.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -55,10 +55,10 @@ import android.testing.AndroidTestingRunner;
		import android.text.TextUtils;

		import com.android.keyguard.logging.CarrierTextManagerLogger;
		import com.android.systemui.res.R;
		import com.android.systemui.SysuiTestCase;
		import com.android.systemui.dump.LogBufferHelperKt;
		import com.android.systemui.keyguard.WakefulnessLifecycle;
		import com.android.systemui.log.LogBufferHelperKt;
		import com.android.systemui.res.R;
		import com.android.systemui.statusbar.pipeline.wifi.data.repository.FakeWifiRepository;
		import com.android.systemui.statusbar.pipeline.wifi.shared.model.WifiNetworkModel;
		import com.android.systemui.telephony.TelephonyListenerManager;

packages/SystemUI/tests/src/com/android/systemui/FaceScanningProviderFactoryTest.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -26,8 +26,8 @@ import com.android.internal.R
		import com.android.keyguard.KeyguardUpdateMonitor
		import com.android.systemui.biometrics.AuthController
		import com.android.systemui.decor.FaceScanningProviderFactory
		import com.android.systemui.dump.logcatLogBuffer
		import com.android.systemui.log.ScreenDecorationsLogger
		import com.android.systemui.log.logcatLogBuffer
		import com.android.systemui.plugins.statusbar.StatusBarStateController
		import com.android.systemui.util.mockito.whenever
		import com.google.common.truth.Truth.assertThat

packages/SystemUI/tests/src/com/android/systemui/ScreenDecorationsTest.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@ import static android.view.DisplayCutout.BOUNDS_POSITION_TOP;
		import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_IS_ROUNDED_CORNERS_OVERLAY;

		import static com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn;
		import static com.android.systemui.dump.LogBufferHelperKt.logcatLogBuffer;
		import static com.android.systemui.log.LogBufferHelperKt.logcatLogBuffer;

		import static com.google.common.truth.Truth.assertThat;