From 1a21b366f9f83b03507534d905a4d34e2824d811 Mon Sep 17 00:00:00 2001 From: Darrell Shi Date: Fri, 28 Apr 2023 19:51:44 +0000 Subject: Revert^2 "Move LogBuffer and related to SystemUILogLib." d738e282ed923b2beefeb30fcbec005aec2097d9 Change-Id: I93a842bdd9eca25a3bdca941232068a96bcf788d --- packages/SystemUI/Android.bp | 1 + .../systemui/shared/clocks/AnimatableClockView.kt | 4 +- .../systemui/shared/clocks/ClockRegistry.kt | 12 +- .../shared/clocks/DefaultClockController.kt | 2 +- packages/SystemUI/log/.gitignore | 9 + packages/SystemUI/log/Android.bp | 38 +++ packages/SystemUI/log/AndroidManifest.xml | 22 ++ .../android/systemui/log/ConstantStringsLogger.kt | 33 +++ .../systemui/log/ConstantStringsLoggerImpl.kt | 29 ++ .../log/src/com/android/systemui/log/LogBuffer.kt | 300 +++++++++++++++++++++ .../log/src/com/android/systemui/log/LogLevel.kt | 29 ++ .../log/src/com/android/systemui/log/LogMessage.kt | 95 +++++++ .../src/com/android/systemui/log/LogMessageImpl.kt | 92 +++++++ .../com/android/systemui/log/LogcatEchoTracker.kt | 29 ++ .../android/systemui/log/LogcatEchoTrackerDebug.kt | 139 ++++++++++ .../android/systemui/log/LogcatEchoTrackerProd.kt | 30 +++ packages/SystemUI/plugin/Android.bp | 2 +- .../systemui/plugins/ClockProviderPlugin.kt | 2 +- .../systemui/plugins/log/ConstantStringsLogger.kt | 33 --- .../plugins/log/ConstantStringsLoggerImpl.kt | 29 -- .../com/android/systemui/plugins/log/LogBuffer.kt | 300 --------------------- .../com/android/systemui/plugins/log/LogLevel.kt | 29 -- .../com/android/systemui/plugins/log/LogMessage.kt | 95 ------- .../android/systemui/plugins/log/LogMessageImpl.kt | 92 ------- .../systemui/plugins/log/LogcatEchoTracker.kt | 29 -- .../systemui/plugins/log/LogcatEchoTrackerDebug.kt | 139 ---------- .../systemui/plugins/log/LogcatEchoTrackerProd.kt | 30 --- .../SystemUI/plugin/tests/log/LogBufferTest.kt | 138 ---------- .../com/android/keyguard/ClockEventController.kt | 4 +- .../com/android/keyguard/KeyguardClockSwitch.java | 4 +- .../keyguard/KeyguardClockSwitchController.java | 4 +- .../android/keyguard/KeyguardVisibilityHelper.java | 4 +- .../keyguard/dagger/ClockRegistryModule.java | 2 +- .../logging/BiometricMessageDeferralLogger.kt | 4 +- .../keyguard/logging/BiometricUnlockLogger.kt | 8 +- .../com/android/keyguard/logging/KeyguardLogger.kt | 4 +- .../logging/KeyguardUpdateMonitorLogger.kt | 14 +- .../keyguard/logging/TrustRepositoryLogger.kt | 4 +- .../systemui/biometrics/AuthRippleController.kt | 2 +- .../com/android/systemui/biometrics/UdfpsLogger.kt | 10 +- .../android/systemui/bluetooth/BluetoothLogger.kt | 4 +- .../broadcast/logging/BroadcastDispatcherLogger.kt | 10 +- .../src/com/android/systemui/doze/DozeLogger.kt | 8 +- .../src/com/android/systemui/dreams/DreamLogger.kt | 4 +- .../src/com/android/systemui/dump/DumpHandler.kt | 2 +- .../src/com/android/systemui/dump/DumpManager.kt | 2 +- .../android/systemui/dump/LogBufferEulogizer.kt | 2 +- .../interactor/KeyguardTransitionAuditLogger.kt | 2 +- .../systemui/log/FaceAuthenticationLogger.kt | 3 +- .../com/android/systemui/log/LogBufferFactory.kt | 3 - .../systemui/log/ScreenDecorationsLogger.kt | 6 +- .../android/systemui/log/dagger/BiometricLog.java | 2 +- .../log/dagger/BroadcastDispatcherLog.java | 2 +- .../log/dagger/CollapsedSbFragmentLog.java | 2 +- .../com/android/systemui/log/dagger/DozeLog.java | 2 +- .../systemui/log/dagger/KeyguardClockLog.kt | 6 +- .../systemui/log/dagger/LSShadeTransitionLog.java | 2 +- .../com/android/systemui/log/dagger/LogModule.java | 8 +- .../systemui/log/dagger/MediaBrowserLog.java | 2 +- .../log/dagger/MediaCarouselControllerLog.java | 2 +- .../systemui/log/dagger/MediaMuteAwaitLog.java | 2 +- .../log/dagger/MediaTimeoutListenerLog.java | 2 +- .../android/systemui/log/dagger/MediaViewLog.java | 2 +- .../systemui/log/dagger/NearbyMediaDevicesLog.java | 2 +- .../systemui/log/dagger/NotifInteractionLog.java | 2 +- .../log/dagger/NotificationHeadsUpLog.java | 2 +- .../log/dagger/NotificationInterruptLog.java | 2 +- .../log/dagger/NotificationLockscreenLog.java | 2 +- .../systemui/log/dagger/NotificationLog.java | 2 +- .../systemui/log/dagger/NotificationRenderLog.java | 2 +- .../log/dagger/NotificationSectionLog.java | 2 +- .../android/systemui/log/dagger/PrivacyLog.java | 2 +- .../android/systemui/log/dagger/QSConfigLog.java | 2 +- .../systemui/log/dagger/QSFragmentDisableLog.java | 2 +- .../src/com/android/systemui/log/dagger/QSLog.java | 2 +- .../com/android/systemui/log/dagger/ShadeLog.java | 2 +- .../systemui/log/dagger/ShadeWindowLog.java | 2 +- .../log/dagger/StatusBarNetworkControllerLog.java | 2 +- .../android/systemui/log/dagger/SwipeUpLog.java | 2 +- .../com/android/systemui/log/dagger/ToastLog.java | 2 +- .../systemui/log/dagger/UnseenNotificationLog.java | 2 +- .../android/systemui/log/table/TableLogBuffer.kt | 6 +- .../systemui/log/table/TableLogBufferFactory.kt | 2 +- .../media/controls/pipeline/MediaTimeoutLogger.kt | 4 +- .../controls/resume/ResumeMediaBrowserLogger.kt | 4 +- .../controls/ui/MediaCarouselControllerLogger.kt | 4 +- .../systemui/media/controls/ui/MediaViewLogger.kt | 4 +- .../android/systemui/media/dagger/MediaModule.java | 10 +- .../media/muteawait/MediaMuteAwaitLogger.kt | 4 +- .../media/nearby/NearbyMediaDevicesLogger.kt | 4 +- .../taptotransfer/common/MediaTttLoggerUtils.kt | 4 +- .../receiver/MediaTttReceiverLogBuffer.java | 2 +- .../receiver/MediaTttReceiverLogger.kt | 2 +- .../sender/MediaTttSenderLogBuffer.java | 2 +- .../taptotransfer/sender/MediaTttSenderLogger.kt | 4 +- .../systemui/privacy/logging/PrivacyLogger.kt | 6 +- .../systemui/qs/QSFragmentDisableFlagsLogger.kt | 4 +- .../com/android/systemui/qs/logging/QSLogger.kt | 12 +- .../qs/pipeline/dagger/QSPipelineModule.kt | 2 +- .../qs/pipeline/shared/logging/QSPipelineLogger.kt | 4 +- .../src/com/android/systemui/shade/ShadeLogger.kt | 4 +- .../android/systemui/shade/ShadeWindowLogger.kt | 12 +- .../systemui/statusbar/ActionClickLogger.kt | 4 +- .../statusbar/KeyguardIndicationController.java | 4 +- .../connectivity/NetworkControllerImpl.java | 8 +- .../statusbar/gesture/SwipeUpGestureLogger.kt | 4 +- .../notification/NotificationClickerLogger.kt | 4 +- .../NotificationWakeUpCoordinatorLogger.kt | 4 +- .../notification/RemoteInputControllerLogger.kt | 4 +- .../collection/coalescer/GroupCoalescerLogger.kt | 4 +- .../coordinator/GutsCoordinatorLogger.kt | 4 +- .../coordinator/HeadsUpCoordinatorLogger.kt | 4 +- .../coordinator/KeyguardCoordinatorLogger.kt | 4 +- .../coordinator/PreparationCoordinatorLogger.kt | 4 +- .../coordinator/ShadeEventCoordinatorLogger.kt | 4 +- .../listbuilder/ShadeListBuilderLogger.kt | 8 +- .../notifcollection/NotifCollectionLogger.kt | 12 +- .../collection/render/NodeSpecBuilderLogger.kt | 4 +- .../collection/render/ShadeViewDifferLogger.kt | 4 +- .../interruption/HeadsUpViewBinderLogger.kt | 4 +- .../interruption/NotificationInterruptLogger.kt | 8 +- .../logging/NotificationRoundnessLogger.kt | 4 +- .../notification/row/NotifBindPipelineLogger.kt | 4 +- .../notification/row/NotificationRowLogger.kt | 4 +- .../notification/row/RowContentBindStageLogger.kt | 4 +- .../stack/NotificationSectionsLogger.kt | 4 +- .../stack/NotificationStackScrollLogger.kt | 6 +- .../notification/stack/StackStateLogger.kt | 4 +- .../phone/KeyguardStatusBarViewController.java | 2 +- .../statusbar/phone/LSShadeTransitionLogger.kt | 4 +- .../StatusBarNotificationActivityStarterLogger.kt | 10 +- .../fragment/CollapsedStatusBarFragmentLogger.kt | 4 +- .../pipeline/dagger/StatusBarPipelineModule.kt | 2 +- .../pipeline/mobile/data/MobileInputLogger.kt | 4 +- .../pipeline/mobile/ui/MobileViewLogger.kt | 4 +- .../pipeline/mobile/ui/VerboseMobileViewLogger.kt | 4 +- .../pipeline/shared/ConnectivityInputLogger.kt | 4 +- .../statusbar/pipeline/shared/LoggerHelper.kt | 4 +- .../shared/data/model/DefaultConnectionModel.kt | 2 +- .../pipeline/wifi/shared/WifiInputLogger.kt | 4 +- ...viceStateRotationLockSettingControllerLogger.kt | 4 +- .../statusbar/policy/HeadsUpManagerLogger.kt | 6 +- .../temporarydisplay/TemporaryViewLogger.kt | 4 +- .../temporarydisplay/chipbar/ChipbarLogger.kt | 4 +- .../dagger/TemporaryDisplayModule.kt | 2 +- .../src/com/android/systemui/toast/ToastLogger.kt | 8 +- .../systemui/util/wakelock/WakeLockLog.java | 2 +- .../systemui/util/wakelock/WakeLockLogger.kt | 4 +- .../android/keyguard/ClockEventControllerTest.kt | 2 +- .../KeyguardClockSwitchControllerTest.java | 2 +- .../com/android/systemui/dump/DumpHandlerTest.kt | 2 +- .../com/android/systemui/dump/DumpManagerTest.kt | 2 +- .../com/android/systemui/dump/LogBufferHelper.kt | 6 +- .../data/repository/TrustRepositoryTest.kt | 4 +- .../src/com/android/systemui/log/LogBufferTest.kt | 137 ++++++++++ .../systemui/log/table/TableLogBufferTest.kt | 4 +- .../common/MediaTttLoggerUtilsTest.kt | 4 +- .../receiver/MediaTttReceiverLoggerTest.kt | 4 +- .../sender/MediaTttSenderLoggerTest.kt | 4 +- .../qs/QSFragmentDisableFlagsLoggerTest.kt | 2 +- .../statusbar/LSShadeTransitionLoggerTest.kt | 2 +- .../connectivity/NetworkControllerBaseTest.java | 2 +- .../connectivity/NetworkControllerDataTest.java | 2 +- .../connectivity/NetworkControllerSignalTest.java | 2 +- .../NotificationWakeUpCoordinatorLoggerTest.kt | 6 +- .../CollapsedStatusBarFragmentLoggerTest.kt | 2 +- .../fragment/CollapsedStatusBarFragmentTest.java | 4 +- .../data/model/DefaultConnectionModelTest.kt | 2 +- .../temporarydisplay/TemporaryViewLoggerTest.kt | 4 +- 169 files changed, 1267 insertions(+), 1202 deletions(-) create mode 100644 packages/SystemUI/log/.gitignore create mode 100644 packages/SystemUI/log/Android.bp create mode 100644 packages/SystemUI/log/AndroidManifest.xml create mode 100644 packages/SystemUI/log/src/com/android/systemui/log/ConstantStringsLogger.kt create mode 100644 packages/SystemUI/log/src/com/android/systemui/log/ConstantStringsLoggerImpl.kt create mode 100644 packages/SystemUI/log/src/com/android/systemui/log/LogBuffer.kt create mode 100644 packages/SystemUI/log/src/com/android/systemui/log/LogLevel.kt create mode 100644 packages/SystemUI/log/src/com/android/systemui/log/LogMessage.kt create mode 100644 packages/SystemUI/log/src/com/android/systemui/log/LogMessageImpl.kt create mode 100644 packages/SystemUI/log/src/com/android/systemui/log/LogcatEchoTracker.kt create mode 100644 packages/SystemUI/log/src/com/android/systemui/log/LogcatEchoTrackerDebug.kt create mode 100644 packages/SystemUI/log/src/com/android/systemui/log/LogcatEchoTrackerProd.kt delete mode 100644 packages/SystemUI/plugin/src/com/android/systemui/plugins/log/ConstantStringsLogger.kt delete mode 100644 packages/SystemUI/plugin/src/com/android/systemui/plugins/log/ConstantStringsLoggerImpl.kt delete mode 100644 packages/SystemUI/plugin/src/com/android/systemui/plugins/log/LogBuffer.kt delete mode 100644 packages/SystemUI/plugin/src/com/android/systemui/plugins/log/LogLevel.kt delete mode 100644 packages/SystemUI/plugin/src/com/android/systemui/plugins/log/LogMessage.kt delete mode 100644 packages/SystemUI/plugin/src/com/android/systemui/plugins/log/LogMessageImpl.kt delete mode 100644 packages/SystemUI/plugin/src/com/android/systemui/plugins/log/LogcatEchoTracker.kt delete mode 100644 packages/SystemUI/plugin/src/com/android/systemui/plugins/log/LogcatEchoTrackerDebug.kt delete mode 100644 packages/SystemUI/plugin/src/com/android/systemui/plugins/log/LogcatEchoTrackerProd.kt delete mode 100644 packages/SystemUI/plugin/tests/log/LogBufferTest.kt create mode 100644 packages/SystemUI/tests/src/com/android/systemui/log/LogBufferTest.kt diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp index e6bbf9759651..6a7b8cdfceec 100644 --- a/packages/SystemUI/Android.bp +++ b/packages/SystemUI/Android.bp @@ -158,6 +158,7 @@ android_library { "SystemUIAnimationLib", "SystemUICommon", "SystemUICustomizationLib", + "SystemUILogLib", "SystemUIPluginLib", "SystemUISharedLib", "SystemUI-statsd", diff --git a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/AnimatableClockView.kt b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/AnimatableClockView.kt index 3a19990f0627..941a925c9d10 100644 --- a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/AnimatableClockView.kt +++ b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/AnimatableClockView.kt @@ -33,8 +33,8 @@ import com.android.systemui.animation.GlyphCallback import com.android.systemui.animation.Interpolators import com.android.systemui.animation.TextAnimator import com.android.systemui.customization.R -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel.DEBUG +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel.DEBUG import java.io.PrintWriter import java.util.Calendar import java.util.Locale diff --git a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/ClockRegistry.kt b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/ClockRegistry.kt index b0c02407873c..aa1bb3f640ee 100644 --- a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/ClockRegistry.kt +++ b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/ClockRegistry.kt @@ -23,6 +23,12 @@ import android.os.UserHandle import android.provider.Settings import android.util.Log import androidx.annotation.OpenForTesting +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel +import com.android.systemui.log.LogMessage +import com.android.systemui.log.LogMessageImpl +import com.android.systemui.log.MessageInitializer +import com.android.systemui.log.MessagePrinter import com.android.systemui.plugins.ClockController import com.android.systemui.plugins.ClockId import com.android.systemui.plugins.ClockMetadata @@ -32,12 +38,6 @@ import com.android.systemui.plugins.ClockSettings import com.android.systemui.plugins.PluginLifecycleManager import com.android.systemui.plugins.PluginListener import com.android.systemui.plugins.PluginManager -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel -import com.android.systemui.plugins.log.LogMessage -import com.android.systemui.plugins.log.LogMessageImpl -import com.android.systemui.plugins.log.MessageInitializer -import com.android.systemui.plugins.log.MessagePrinter import com.android.systemui.util.Assert import java.io.PrintWriter import java.util.concurrent.ConcurrentHashMap diff --git a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt index 2cc36008e4f8..6aa74fbf24e7 100644 --- a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt +++ b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt @@ -24,6 +24,7 @@ import android.view.View import android.widget.FrameLayout import androidx.annotation.VisibleForTesting import com.android.systemui.customization.R +import com.android.systemui.log.LogBuffer import com.android.systemui.plugins.ClockAnimations import com.android.systemui.plugins.ClockConfig import com.android.systemui.plugins.ClockController @@ -32,7 +33,6 @@ import com.android.systemui.plugins.ClockFaceConfig import com.android.systemui.plugins.ClockFaceController import com.android.systemui.plugins.ClockFaceEvents import com.android.systemui.plugins.ClockSettings -import com.android.systemui.plugins.log.LogBuffer import java.io.PrintWriter import java.util.Locale import java.util.TimeZone diff --git a/packages/SystemUI/log/.gitignore b/packages/SystemUI/log/.gitignore new file mode 100644 index 000000000000..f9a33dbbcc7e --- /dev/null +++ b/packages/SystemUI/log/.gitignore @@ -0,0 +1,9 @@ +.idea/ +.gradle/ +gradle/ +build/ +gradlew* +local.properties +*.iml +android.properties +buildSrc \ No newline at end of file diff --git a/packages/SystemUI/log/Android.bp b/packages/SystemUI/log/Android.bp new file mode 100644 index 000000000000..627ac4b7c381 --- /dev/null +++ b/packages/SystemUI/log/Android.bp @@ -0,0 +1,38 @@ +// 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 { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "frameworks_base_packages_SystemUI_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["frameworks_base_packages_SystemUI_license"], +} + +android_library { + name: "SystemUILogLib", + srcs: [ + "src/**/*.java", + "src/**/*.kt", + ], + static_libs: [ + "androidx.core_core-ktx", + "androidx.annotation_annotation", + "error_prone_annotations", + "SystemUICommon", + ], + manifest: "AndroidManifest.xml", + kotlincflags: ["-Xjvm-default=all"], +} diff --git a/packages/SystemUI/log/AndroidManifest.xml b/packages/SystemUI/log/AndroidManifest.xml new file mode 100644 index 000000000000..4021e1a5f751 --- /dev/null +++ b/packages/SystemUI/log/AndroidManifest.xml @@ -0,0 +1,22 @@ + + + + + + + diff --git a/packages/SystemUI/log/src/com/android/systemui/log/ConstantStringsLogger.kt b/packages/SystemUI/log/src/com/android/systemui/log/ConstantStringsLogger.kt new file mode 100644 index 000000000000..bc35095a3436 --- /dev/null +++ b/packages/SystemUI/log/src/com/android/systemui/log/ConstantStringsLogger.kt @@ -0,0 +1,33 @@ +/* + * 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.log + +import com.google.errorprone.annotations.CompileTimeConstant + +/** + * Handy for adding basic logging with CompileTimeConstant strings - so logging with no variables. + * Most likely you want to delegate it to [ConstantStringsLoggerImpl]. + */ +interface ConstantStringsLogger { + fun v(@CompileTimeConstant msg: String) + + fun d(@CompileTimeConstant msg: String) + + fun w(@CompileTimeConstant msg: String) + + fun e(@CompileTimeConstant msg: String) +} diff --git a/packages/SystemUI/log/src/com/android/systemui/log/ConstantStringsLoggerImpl.kt b/packages/SystemUI/log/src/com/android/systemui/log/ConstantStringsLoggerImpl.kt new file mode 100644 index 000000000000..6fc525369e8b --- /dev/null +++ b/packages/SystemUI/log/src/com/android/systemui/log/ConstantStringsLoggerImpl.kt @@ -0,0 +1,29 @@ +/* + * 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.log + +import com.google.errorprone.annotations.CompileTimeConstant + +class ConstantStringsLoggerImpl(val buffer: LogBuffer, val tag: String) : ConstantStringsLogger { + override fun v(@CompileTimeConstant msg: String) = buffer.log(tag, LogLevel.VERBOSE, msg) + + override fun d(@CompileTimeConstant msg: String) = buffer.log(tag, LogLevel.DEBUG, msg) + + override fun w(@CompileTimeConstant msg: String) = buffer.log(tag, LogLevel.WARNING, msg) + + override fun e(@CompileTimeConstant msg: String) = buffer.log(tag, LogLevel.ERROR, msg) +} diff --git a/packages/SystemUI/log/src/com/android/systemui/log/LogBuffer.kt b/packages/SystemUI/log/src/com/android/systemui/log/LogBuffer.kt new file mode 100644 index 000000000000..af1a11f6597a --- /dev/null +++ b/packages/SystemUI/log/src/com/android/systemui/log/LogBuffer.kt @@ -0,0 +1,300 @@ +/* + * Copyright (C) 2020 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.log + +import android.os.Trace +import android.util.Log +import com.android.systemui.common.buffer.RingBuffer +import com.google.errorprone.annotations.CompileTimeConstant +import java.io.PrintWriter +import java.util.concurrent.ArrayBlockingQueue +import java.util.concurrent.BlockingQueue +import kotlin.concurrent.thread +import kotlin.math.max + +/** + * A simple ring buffer of recyclable log messages + * + * The goal of this class is to enable logging that is both extremely chatty and extremely + * lightweight. If done properly, logging a message will not result in any heap allocations or + * string generation. Messages are only converted to strings if the log is actually dumped (usually + * as the result of taking a bug report). + * + * You can dump the entire buffer at any time by running: + * ``` + * $ adb shell dumpsys activity service com.android.systemui/.SystemUIService + * ``` + * + * ...where `bufferName` is the (case-sensitive) [name] passed to the constructor. + * + * By default, only messages of WARN level or higher are echoed to logcat, but this can be adjusted + * locally (usually for debugging purposes). + * + * To enable logcat echoing for an entire buffer: + * ``` + * $ adb shell settings put global systemui/buffer/ + * ``` + * + * To enable logcat echoing for a specific tag: + * ``` + * $ adb shell settings put global systemui/tag/ + * ``` + * + * In either case, `level` can be any of `verbose`, `debug`, `info`, `warn`, `error`, `assert`, or + * the first letter of any of the previous. + * + * In SystemUI, buffers are provided by LogModule. Instances should be created using a SysUI + * LogBufferFactory. + * + * @param name The name of this buffer, printed when the buffer is dumped and in some other + * situations. + * @param maxSize The maximum number of messages to keep in memory at any one time. Buffers start + * out empty and grow up to [maxSize] as new messages are logged. Once the buffer's size reaches + * the maximum, it behaves like a ring buffer. + */ +class LogBuffer +@JvmOverloads +constructor( + private val name: String, + private val maxSize: Int, + private val logcatEchoTracker: LogcatEchoTracker, + private val systrace: Boolean = true, +) { + private val buffer = RingBuffer(maxSize) { LogMessageImpl.create() } + + private val echoMessageQueue: BlockingQueue? = + if (logcatEchoTracker.logInBackgroundThread) ArrayBlockingQueue(10) else null + + init { + if (logcatEchoTracker.logInBackgroundThread && echoMessageQueue != null) { + thread(start = true, name = "LogBuffer-$name", priority = Thread.NORM_PRIORITY) { + try { + while (true) { + echoToDesiredEndpoints(echoMessageQueue.take()) + } + } catch (e: InterruptedException) { + Thread.currentThread().interrupt() + } + } + } + } + + var frozen = false + private set + + private val mutable + get() = !frozen && maxSize > 0 + + /** + * Logs a message to the log buffer + * + * May also log the message to logcat if echoing is enabled for this buffer or tag. + * + * The actual string of the log message is not constructed until it is needed. To accomplish + * this, logging a message is a two-step process. First, a fresh instance of [LogMessage] is + * obtained and is passed to the [messageInitializer]. The initializer stores any relevant data + * on the message's fields. The message is then inserted into the buffer where it waits until it + * is either pushed out by newer messages or it needs to printed. If and when this latter moment + * occurs, the [messagePrinter] function is called on the message. It reads whatever data the + * initializer stored and converts it to a human-readable log message. + * + * @param tag A string of at most 23 characters, used for grouping logs into categories or + * subjects. If this message is echoed to logcat, this will be the tag that is used. + * @param level Which level to log the message at, both to the buffer and to logcat if it's + * echoed. In general, a module should split most of its logs into either INFO or DEBUG level. + * INFO level should be reserved for information that other parts of the system might care + * about, leaving the specifics of code's day-to-day operations to DEBUG. + * @param messageInitializer A function that will be called immediately to store relevant data + * on the log message. The value of `this` will be the LogMessage to be initialized. + * @param messagePrinter A function that will be called if and when the message needs to be + * dumped to logcat or a bug report. It should read the data stored by the initializer and + * convert it to a human-readable string. The value of `this` will be the LogMessage to be + * printed. **IMPORTANT:** The printer should ONLY ever reference fields on the LogMessage and + * NEVER any variables in its enclosing scope. Otherwise, the runtime will need to allocate a + * new instance of the printer for each call, thwarting our attempts at avoiding any sort of + * allocation. + * @param exception Provide any exception that need to be logged. This is saved as + * [LogMessage.exception] + */ + @JvmOverloads + inline fun log( + tag: String, + level: LogLevel, + messageInitializer: MessageInitializer, + noinline messagePrinter: MessagePrinter, + exception: Throwable? = null, + ) { + val message = obtain(tag, level, messagePrinter, exception) + messageInitializer(message) + commit(message) + } + + /** + * Logs a compile-time string constant [message] to the log buffer. Use sparingly. + * + * May also log the message to logcat if echoing is enabled for this buffer or tag. This is for + * simpler use-cases where [message] is a compile time string constant. For use-cases where the + * log message is built during runtime, use the [LogBuffer.log] overloaded method that takes in + * an initializer and a message printer. + * + * Log buffers are limited by the number of entries, so logging more frequently will limit the + * time window that the LogBuffer covers in a bug report. Richer logs, on the other hand, make a + * bug report more actionable, so using the [log] with a messagePrinter to add more detail to + * every log may do more to improve overall logging than adding more logs with this method. + */ + @JvmOverloads + fun log( + tag: String, + level: LogLevel, + @CompileTimeConstant message: String, + exception: Throwable? = null, + ) = log(tag, level, { str1 = message }, { str1!! }, exception) + + /** + * You should call [log] instead of this method. + * + * Obtains the next [LogMessage] from the ring buffer. If the buffer is not yet at max size, + * grows the buffer by one. + * + * After calling [obtain], the message will now be at the end of the buffer. The caller must + * store any relevant data on the message and then call [commit]. + */ + @Synchronized + fun obtain( + tag: String, + level: LogLevel, + messagePrinter: MessagePrinter, + exception: Throwable? = null, + ): LogMessage { + if (!mutable) { + return FROZEN_MESSAGE + } + val message = buffer.advance() + message.reset(tag, level, System.currentTimeMillis(), messagePrinter, exception) + return message + } + + /** + * You should call [log] instead of this method. + * + * After acquiring a message via [obtain], call this method to signal to the buffer that you + * have finished filling in its data fields. The message will be echoed to logcat if necessary. + */ + @Synchronized + fun commit(message: LogMessage) { + if (!mutable) { + return + } + // Log in the background thread only if echoMessageQueue exists and has capacity (checking + // capacity avoids the possibility of blocking this thread) + if (echoMessageQueue != null && echoMessageQueue.remainingCapacity() > 0) { + try { + echoMessageQueue.put(message) + } catch (e: InterruptedException) { + // the background thread has been shut down, so just log on this one + echoToDesiredEndpoints(message) + } + } else { + echoToDesiredEndpoints(message) + } + } + + /** Sends message to echo after determining whether to use Logcat and/or systrace. */ + private fun echoToDesiredEndpoints(message: LogMessage) { + val includeInLogcat = + logcatEchoTracker.isBufferLoggable(name, message.level) || + logcatEchoTracker.isTagLoggable(message.tag, message.level) + echo(message, toLogcat = includeInLogcat, toSystrace = systrace) + } + + /** Converts the entire buffer to a newline-delimited string */ + @Synchronized + fun dump(pw: PrintWriter, tailLength: Int) { + val iterationStart = + if (tailLength <= 0) { + 0 + } else { + max(0, buffer.size - tailLength) + } + + for (i in iterationStart until buffer.size) { + buffer[i].dump(pw) + } + } + + /** + * "Freezes" the contents of the buffer, making it immutable until [unfreeze] is called. Calls + * to [log], [obtain], and [commit] will not affect the buffer and will return dummy values if + * necessary. + */ + @Synchronized + fun freeze() { + if (!frozen) { + log(TAG, LogLevel.DEBUG, { str1 = name }, { "$str1 frozen" }) + frozen = true + } + } + + /** Undoes the effects of calling [freeze]. */ + @Synchronized + fun unfreeze() { + if (frozen) { + frozen = false + log(TAG, LogLevel.DEBUG, { str1 = name }, { "$str1 unfrozen" }) + } + } + + private fun echo(message: LogMessage, toLogcat: Boolean, toSystrace: Boolean) { + if (toLogcat || toSystrace) { + val strMessage = message.messagePrinter(message) + if (toSystrace) { + echoToSystrace(message, strMessage) + } + if (toLogcat) { + echoToLogcat(message, strMessage) + } + } + } + + private fun echoToSystrace(message: LogMessage, strMessage: String) { + Trace.instantForTrack( + Trace.TRACE_TAG_APP, + "UI Events", + "$name - ${message.level.shortString} ${message.tag}: $strMessage" + ) + } + + private fun echoToLogcat(message: LogMessage, strMessage: String) { + when (message.level) { + LogLevel.VERBOSE -> Log.v(message.tag, strMessage, message.exception) + LogLevel.DEBUG -> Log.d(message.tag, strMessage, message.exception) + LogLevel.INFO -> Log.i(message.tag, strMessage, message.exception) + LogLevel.WARNING -> Log.w(message.tag, strMessage, message.exception) + LogLevel.ERROR -> Log.e(message.tag, strMessage, message.exception) + LogLevel.WTF -> Log.wtf(message.tag, strMessage, message.exception) + } + } +} + +/** + * A function that will be called immediately to store relevant data on the log message. The value + * of `this` will be the LogMessage to be initialized. + */ +typealias MessageInitializer = LogMessage.() -> Unit + +private const val TAG = "LogBuffer" +private val FROZEN_MESSAGE = LogMessageImpl.create() diff --git a/packages/SystemUI/log/src/com/android/systemui/log/LogLevel.kt b/packages/SystemUI/log/src/com/android/systemui/log/LogLevel.kt new file mode 100644 index 000000000000..7d9647a13149 --- /dev/null +++ b/packages/SystemUI/log/src/com/android/systemui/log/LogLevel.kt @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2020 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.log + +import android.util.Log + +/** Enum version of @Log.Level */ +enum class LogLevel(@Log.Level val nativeLevel: Int, val shortString: String) { + VERBOSE(Log.VERBOSE, "V"), + DEBUG(Log.DEBUG, "D"), + INFO(Log.INFO, "I"), + WARNING(Log.WARN, "W"), + ERROR(Log.ERROR, "E"), + WTF(Log.ASSERT, "WTF") +} diff --git a/packages/SystemUI/log/src/com/android/systemui/log/LogMessage.kt b/packages/SystemUI/log/src/com/android/systemui/log/LogMessage.kt new file mode 100644 index 000000000000..88c34f82a089 --- /dev/null +++ b/packages/SystemUI/log/src/com/android/systemui/log/LogMessage.kt @@ -0,0 +1,95 @@ +/* + * Copyright (C) 2020 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.log + +import java.io.PrintWriter +import java.text.SimpleDateFormat +import java.util.Locale + +/** + * Generic data class for storing messages logged to a [LogBuffer] + * + * Each LogMessage has a few standard fields ([level], [tag], and [timestamp]). The rest are generic + * data slots that may or may not be used, depending on the nature of the specific message being + * logged. + * + * When a message is logged, the code doing the logging stores data in one or more of the generic + * fields ([str1], [int1], etc). When it comes time to dump the message to logcat/bugreport/etc, the + * [messagePrinter] function reads the data stored in the generic fields and converts that to a + * human- readable string. Thus, for every log type there must be a specialized initializer function + * that stores data specific to that log type and a specialized printer function that prints that + * data. + * + * See [LogBuffer.log] for more information. + */ +interface LogMessage { + val level: LogLevel + val tag: String + val timestamp: Long + val messagePrinter: MessagePrinter + val exception: Throwable? + + var str1: String? + var str2: String? + var str3: String? + var int1: Int + var int2: Int + var long1: Long + var long2: Long + var double1: Double + var bool1: Boolean + var bool2: Boolean + var bool3: Boolean + var bool4: Boolean + + /** Function that dumps the [LogMessage] to the provided [writer]. */ + fun dump(writer: PrintWriter) { + val formattedTimestamp = DATE_FORMAT.format(timestamp) + val shortLevel = level.shortString + val messageToPrint = messagePrinter(this) + printLikeLogcat(writer, formattedTimestamp, shortLevel, tag, messageToPrint) + exception?.printStackTrace(writer) + } +} + +/** + * A function that will be called if and when the message needs to be dumped to logcat or a bug + * report. It should read the data stored by the initializer and convert it to a human-readable + * string. The value of `this` will be the LogMessage to be printed. **IMPORTANT:** The printer + * should ONLY ever reference fields on the LogMessage and NEVER any variables in its enclosing + * scope. Otherwise, the runtime will need to allocate a new instance of the printer for each call, + * thwarting our attempts at avoiding any sort of allocation. + */ +typealias MessagePrinter = LogMessage.() -> String + +private fun printLikeLogcat( + pw: PrintWriter, + formattedTimestamp: String, + shortLogLevel: String, + tag: String, + message: String +) { + pw.print(formattedTimestamp) + pw.print(" ") + pw.print(shortLogLevel) + pw.print(" ") + pw.print(tag) + pw.print(": ") + pw.println(message) +} + +private val DATE_FORMAT = SimpleDateFormat("MM-dd HH:mm:ss.SSS", Locale.US) diff --git a/packages/SystemUI/log/src/com/android/systemui/log/LogMessageImpl.kt b/packages/SystemUI/log/src/com/android/systemui/log/LogMessageImpl.kt new file mode 100644 index 000000000000..5e10f783850f --- /dev/null +++ b/packages/SystemUI/log/src/com/android/systemui/log/LogMessageImpl.kt @@ -0,0 +1,92 @@ +/* + * Copyright (C) 2020 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.log + +/** Recyclable implementation of [LogMessage]. */ +data class LogMessageImpl( + override var level: LogLevel, + override var tag: String, + override var timestamp: Long, + override var messagePrinter: MessagePrinter, + override var exception: Throwable?, + override var str1: String?, + override var str2: String?, + override var str3: String?, + override var int1: Int, + override var int2: Int, + override var long1: Long, + override var long2: Long, + override var double1: Double, + override var bool1: Boolean, + override var bool2: Boolean, + override var bool3: Boolean, + override var bool4: Boolean, +) : LogMessage { + + fun reset( + tag: String, + level: LogLevel, + timestamp: Long, + renderer: MessagePrinter, + exception: Throwable? = null, + ) { + this.level = level + this.tag = tag + this.timestamp = timestamp + this.messagePrinter = renderer + this.exception = exception + str1 = null + str2 = null + str3 = null + int1 = 0 + int2 = 0 + long1 = 0 + long2 = 0 + double1 = 0.0 + bool1 = false + bool2 = false + bool3 = false + bool4 = false + } + + companion object Factory { + fun create(): LogMessageImpl { + return LogMessageImpl( + LogLevel.DEBUG, + DEFAULT_TAG, + 0, + DEFAULT_PRINTER, + null, + null, + null, + null, + 0, + 0, + 0, + 0, + 0.0, + false, + false, + false, + false + ) + } + } +} + +private const val DEFAULT_TAG = "UnknownTag" +private val DEFAULT_PRINTER: MessagePrinter = { "Unknown message: $this" } diff --git a/packages/SystemUI/log/src/com/android/systemui/log/LogcatEchoTracker.kt b/packages/SystemUI/log/src/com/android/systemui/log/LogcatEchoTracker.kt new file mode 100644 index 000000000000..55f3a738e4f1 --- /dev/null +++ b/packages/SystemUI/log/src/com/android/systemui/log/LogcatEchoTracker.kt @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2020 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.log + +/** Keeps track of which [LogBuffer] messages should also appear in logcat. */ +interface LogcatEchoTracker { + /** Whether [bufferName] should echo messages of [level] or higher to logcat. */ + fun isBufferLoggable(bufferName: String, level: LogLevel): Boolean + + /** Whether [tagName] should echo messages of [level] or higher to logcat. */ + fun isTagLoggable(tagName: String, level: LogLevel): Boolean + + /** Whether to log messages in a background thread. */ + val logInBackgroundThread: Boolean +} diff --git a/packages/SystemUI/log/src/com/android/systemui/log/LogcatEchoTrackerDebug.kt b/packages/SystemUI/log/src/com/android/systemui/log/LogcatEchoTrackerDebug.kt new file mode 100644 index 000000000000..d0ad28f04670 --- /dev/null +++ b/packages/SystemUI/log/src/com/android/systemui/log/LogcatEchoTrackerDebug.kt @@ -0,0 +1,139 @@ +/* + * Copyright (C) 2020 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.log + +import android.content.ContentResolver +import android.database.ContentObserver +import android.net.Uri +import android.os.Handler +import android.os.Looper +import android.os.Trace +import android.provider.Settings + +/** + * Version of [LogcatEchoTracker] for debuggable builds + * + * The log level of individual buffers or tags can be controlled via global settings: + * ``` + * # Echo any message to of or higher + * $ adb shell settings put global systemui/buffer/ + * + * # Echo any message of and of or higher + * $ adb shell settings put global systemui/tag/ + * ``` + */ +class LogcatEchoTrackerDebug private constructor(private val contentResolver: ContentResolver) : + LogcatEchoTracker { + private val cachedBufferLevels: MutableMap = mutableMapOf() + private val cachedTagLevels: MutableMap = mutableMapOf() + override val logInBackgroundThread = true + + companion object Factory { + @JvmStatic + fun create(contentResolver: ContentResolver, mainLooper: Looper): LogcatEchoTrackerDebug { + val tracker = LogcatEchoTrackerDebug(contentResolver) + tracker.attach(mainLooper) + return tracker + } + } + + private fun clearCache() { + Trace.beginSection("LogcatEchoTrackerDebug#clearCache") + cachedBufferLevels.clear() + Trace.endSection() + } + + private fun attach(mainLooper: Looper) { + Trace.beginSection("LogcatEchoTrackerDebug#attach") + contentResolver.registerContentObserver( + Settings.Global.getUriFor(BUFFER_PATH), + true, + object : ContentObserver(Handler(mainLooper)) { + override fun onChange(selfChange: Boolean, uri: Uri?) { + super.onChange(selfChange, uri) + clearCache() + } + } + ) + + contentResolver.registerContentObserver( + Settings.Global.getUriFor(TAG_PATH), + true, + object : ContentObserver(Handler(mainLooper)) { + override fun onChange(selfChange: Boolean, uri: Uri?) { + super.onChange(selfChange, uri) + clearCache() + } + } + ) + Trace.endSection() + } + + /** Whether [bufferName] should echo messages of [level] or higher to logcat. */ + @Synchronized + override fun isBufferLoggable(bufferName: String, level: LogLevel): Boolean { + return level.ordinal >= getLogLevel(bufferName, BUFFER_PATH, cachedBufferLevels).ordinal + } + + /** Whether [tagName] should echo messages of [level] or higher to logcat. */ + @Synchronized + override fun isTagLoggable(tagName: String, level: LogLevel): Boolean { + return level >= getLogLevel(tagName, TAG_PATH, cachedTagLevels) + } + + private fun getLogLevel( + name: String, + path: String, + cache: MutableMap + ): LogLevel { + return cache[name] ?: readSetting("$path/$name").also { cache[name] = it } + } + + private fun readSetting(path: String): LogLevel { + return try { + Trace.beginSection("LogcatEchoTrackerDebug#readSetting") + parseProp(Settings.Global.getString(contentResolver, path)) + } catch (_: Settings.SettingNotFoundException) { + DEFAULT_LEVEL + } finally { + Trace.endSection() + } + } + + private fun parseProp(propValue: String?): LogLevel { + return when (propValue?.lowercase()) { + "verbose" -> LogLevel.VERBOSE + "v" -> LogLevel.VERBOSE + "debug" -> LogLevel.DEBUG + "d" -> LogLevel.DEBUG + "info" -> LogLevel.INFO + "i" -> LogLevel.INFO + "warning" -> LogLevel.WARNING + "warn" -> LogLevel.WARNING + "w" -> LogLevel.WARNING + "error" -> LogLevel.ERROR + "e" -> LogLevel.ERROR + "assert" -> LogLevel.WTF + "wtf" -> LogLevel.WTF + else -> DEFAULT_LEVEL + } + } +} + +private val DEFAULT_LEVEL = LogLevel.WARNING +private const val BUFFER_PATH = "systemui/buffer" +private const val TAG_PATH = "systemui/tag" diff --git a/packages/SystemUI/log/src/com/android/systemui/log/LogcatEchoTrackerProd.kt b/packages/SystemUI/log/src/com/android/systemui/log/LogcatEchoTrackerProd.kt new file mode 100644 index 000000000000..56966773d1b0 --- /dev/null +++ b/packages/SystemUI/log/src/com/android/systemui/log/LogcatEchoTrackerProd.kt @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2020 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.log + +/** Production version of [LogcatEchoTracker] that isn't configurable. */ +class LogcatEchoTrackerProd : LogcatEchoTracker { + override val logInBackgroundThread = false + + override fun isBufferLoggable(bufferName: String, level: LogLevel): Boolean { + return level >= LogLevel.WARNING + } + + override fun isTagLoggable(tagName: String, level: LogLevel): Boolean { + return level >= LogLevel.WARNING + } +} diff --git a/packages/SystemUI/plugin/Android.bp b/packages/SystemUI/plugin/Android.bp index e306d4aac398..1008d37b6d2f 100644 --- a/packages/SystemUI/plugin/Android.bp +++ b/packages/SystemUI/plugin/Android.bp @@ -34,10 +34,10 @@ java_library { static_libs: [ "androidx.annotation_annotation", - "error_prone_annotations", "PluginCoreLib", "SystemUIAnimationLib", "SystemUICommon", + "SystemUILogLib", ], } diff --git a/packages/SystemUI/plugin/src/com/android/systemui/plugins/ClockProviderPlugin.kt b/packages/SystemUI/plugin/src/com/android/systemui/plugins/ClockProviderPlugin.kt index ca3e710a4acb..7bf139e69f2e 100644 --- a/packages/SystemUI/plugin/src/com/android/systemui/plugins/ClockProviderPlugin.kt +++ b/packages/SystemUI/plugin/src/com/android/systemui/plugins/ClockProviderPlugin.kt @@ -18,8 +18,8 @@ import android.graphics.Rect import android.graphics.drawable.Drawable import android.view.View import com.android.internal.annotations.Keep +import com.android.systemui.log.LogBuffer import com.android.systemui.plugins.annotations.ProvidesInterface -import com.android.systemui.plugins.log.LogBuffer import java.io.PrintWriter import java.util.Locale import java.util.TimeZone diff --git a/packages/SystemUI/plugin/src/com/android/systemui/plugins/log/ConstantStringsLogger.kt b/packages/SystemUI/plugin/src/com/android/systemui/plugins/log/ConstantStringsLogger.kt deleted file mode 100644 index f95b1874da36..000000000000 --- a/packages/SystemUI/plugin/src/com/android/systemui/plugins/log/ConstantStringsLogger.kt +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 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.plugins.log - -import com.google.errorprone.annotations.CompileTimeConstant - -/** - * Handy for adding basic logging with CompileTimeConstant strings - so logging with no variables. - * Most likely you want to delegate it to [ConstantStringsLoggerImpl]. - */ -interface ConstantStringsLogger { - fun v(@CompileTimeConstant msg: String) - - fun d(@CompileTimeConstant msg: String) - - fun w(@CompileTimeConstant msg: String) - - fun e(@CompileTimeConstant msg: String) -} diff --git a/packages/SystemUI/plugin/src/com/android/systemui/plugins/log/ConstantStringsLoggerImpl.kt b/packages/SystemUI/plugin/src/com/android/systemui/plugins/log/ConstantStringsLoggerImpl.kt deleted file mode 100644 index 91b39e6fcc13..000000000000 --- a/packages/SystemUI/plugin/src/com/android/systemui/plugins/log/ConstantStringsLoggerImpl.kt +++ /dev/null @@ -1,29 +0,0 @@ -/* - * 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.plugins.log - -import com.google.errorprone.annotations.CompileTimeConstant - -class ConstantStringsLoggerImpl(val buffer: LogBuffer, val tag: String) : ConstantStringsLogger { - override fun v(@CompileTimeConstant msg: String) = buffer.log(tag, LogLevel.VERBOSE, msg) - - override fun d(@CompileTimeConstant msg: String) = buffer.log(tag, LogLevel.DEBUG, msg) - - override fun w(@CompileTimeConstant msg: String) = buffer.log(tag, LogLevel.WARNING, msg) - - override fun e(@CompileTimeConstant msg: String) = buffer.log(tag, LogLevel.ERROR, msg) -} diff --git a/packages/SystemUI/plugin/src/com/android/systemui/plugins/log/LogBuffer.kt b/packages/SystemUI/plugin/src/com/android/systemui/plugins/log/LogBuffer.kt deleted file mode 100644 index 0a7ccc525a73..000000000000 --- a/packages/SystemUI/plugin/src/com/android/systemui/plugins/log/LogBuffer.kt +++ /dev/null @@ -1,300 +0,0 @@ -/* - * Copyright (C) 2020 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.plugins.log - -import android.os.Trace -import android.util.Log -import com.android.systemui.common.buffer.RingBuffer -import com.google.errorprone.annotations.CompileTimeConstant -import java.io.PrintWriter -import java.util.concurrent.ArrayBlockingQueue -import java.util.concurrent.BlockingQueue -import kotlin.concurrent.thread -import kotlin.math.max - -/** - * A simple ring buffer of recyclable log messages - * - * The goal of this class is to enable logging that is both extremely chatty and extremely - * lightweight. If done properly, logging a message will not result in any heap allocations or - * string generation. Messages are only converted to strings if the log is actually dumped (usually - * as the result of taking a bug report). - * - * You can dump the entire buffer at any time by running: - * ``` - * $ adb shell dumpsys activity service com.android.systemui/.SystemUIService - * ``` - * - * ...where `bufferName` is the (case-sensitive) [name] passed to the constructor. - * - * By default, only messages of WARN level or higher are echoed to logcat, but this can be adjusted - * locally (usually for debugging purposes). - * - * To enable logcat echoing for an entire buffer: - * ``` - * $ adb shell settings put global systemui/buffer/ - * ``` - * - * To enable logcat echoing for a specific tag: - * ``` - * $ adb shell settings put global systemui/tag/ - * ``` - * - * In either case, `level` can be any of `verbose`, `debug`, `info`, `warn`, `error`, `assert`, or - * the first letter of any of the previous. - * - * In SystemUI, buffers are provided by LogModule. Instances should be created using a SysUI - * LogBufferFactory. - * - * @param name The name of this buffer, printed when the buffer is dumped and in some other - * situations. - * @param maxSize The maximum number of messages to keep in memory at any one time. Buffers start - * out empty and grow up to [maxSize] as new messages are logged. Once the buffer's size reaches - * the maximum, it behaves like a ring buffer. - */ -class LogBuffer -@JvmOverloads -constructor( - private val name: String, - private val maxSize: Int, - private val logcatEchoTracker: LogcatEchoTracker, - private val systrace: Boolean = true, -) { - private val buffer = RingBuffer(maxSize) { LogMessageImpl.create() } - - private val echoMessageQueue: BlockingQueue? = - if (logcatEchoTracker.logInBackgroundThread) ArrayBlockingQueue(10) else null - - init { - if (logcatEchoTracker.logInBackgroundThread && echoMessageQueue != null) { - thread(start = true, name = "LogBuffer-$name", priority = Thread.NORM_PRIORITY) { - try { - while (true) { - echoToDesiredEndpoints(echoMessageQueue.take()) - } - } catch (e: InterruptedException) { - Thread.currentThread().interrupt() - } - } - } - } - - var frozen = false - private set - - private val mutable - get() = !frozen && maxSize > 0 - - /** - * Logs a message to the log buffer - * - * May also log the message to logcat if echoing is enabled for this buffer or tag. - * - * The actual string of the log message is not constructed until it is needed. To accomplish - * this, logging a message is a two-step process. First, a fresh instance of [LogMessage] is - * obtained and is passed to the [messageInitializer]. The initializer stores any relevant data - * on the message's fields. The message is then inserted into the buffer where it waits until it - * is either pushed out by newer messages or it needs to printed. If and when this latter moment - * occurs, the [messagePrinter] function is called on the message. It reads whatever data the - * initializer stored and converts it to a human-readable log message. - * - * @param tag A string of at most 23 characters, used for grouping logs into categories or - * subjects. If this message is echoed to logcat, this will be the tag that is used. - * @param level Which level to log the message at, both to the buffer and to logcat if it's - * echoed. In general, a module should split most of its logs into either INFO or DEBUG level. - * INFO level should be reserved for information that other parts of the system might care - * about, leaving the specifics of code's day-to-day operations to DEBUG. - * @param messageInitializer A function that will be called immediately to store relevant data - * on the log message. The value of `this` will be the LogMessage to be initialized. - * @param messagePrinter A function that will be called if and when the message needs to be - * dumped to logcat or a bug report. It should read the data stored by the initializer and - * convert it to a human-readable string. The value of `this` will be the LogMessage to be - * printed. **IMPORTANT:** The printer should ONLY ever reference fields on the LogMessage and - * NEVER any variables in its enclosing scope. Otherwise, the runtime will need to allocate a - * new instance of the printer for each call, thwarting our attempts at avoiding any sort of - * allocation. - * @param exception Provide any exception that need to be logged. This is saved as - * [LogMessage.exception] - */ - @JvmOverloads - inline fun log( - tag: String, - level: LogLevel, - messageInitializer: MessageInitializer, - noinline messagePrinter: MessagePrinter, - exception: Throwable? = null, - ) { - val message = obtain(tag, level, messagePrinter, exception) - messageInitializer(message) - commit(message) - } - - /** - * Logs a compile-time string constant [message] to the log buffer. Use sparingly. - * - * May also log the message to logcat if echoing is enabled for this buffer or tag. This is for - * simpler use-cases where [message] is a compile time string constant. For use-cases where the - * log message is built during runtime, use the [LogBuffer.log] overloaded method that takes in - * an initializer and a message printer. - * - * Log buffers are limited by the number of entries, so logging more frequently will limit the - * time window that the LogBuffer covers in a bug report. Richer logs, on the other hand, make a - * bug report more actionable, so using the [log] with a messagePrinter to add more detail to - * every log may do more to improve overall logging than adding more logs with this method. - */ - @JvmOverloads - fun log( - tag: String, - level: LogLevel, - @CompileTimeConstant message: String, - exception: Throwable? = null, - ) = log(tag, level, { str1 = message }, { str1!! }, exception) - - /** - * You should call [log] instead of this method. - * - * Obtains the next [LogMessage] from the ring buffer. If the buffer is not yet at max size, - * grows the buffer by one. - * - * After calling [obtain], the message will now be at the end of the buffer. The caller must - * store any relevant data on the message and then call [commit]. - */ - @Synchronized - fun obtain( - tag: String, - level: LogLevel, - messagePrinter: MessagePrinter, - exception: Throwable? = null, - ): LogMessage { - if (!mutable) { - return FROZEN_MESSAGE - } - val message = buffer.advance() - message.reset(tag, level, System.currentTimeMillis(), messagePrinter, exception) - return message - } - - /** - * You should call [log] instead of this method. - * - * After acquiring a message via [obtain], call this method to signal to the buffer that you - * have finished filling in its data fields. The message will be echoed to logcat if necessary. - */ - @Synchronized - fun commit(message: LogMessage) { - if (!mutable) { - return - } - // Log in the background thread only if echoMessageQueue exists and has capacity (checking - // capacity avoids the possibility of blocking this thread) - if (echoMessageQueue != null && echoMessageQueue.remainingCapacity() > 0) { - try { - echoMessageQueue.put(message) - } catch (e: InterruptedException) { - // the background thread has been shut down, so just log on this one - echoToDesiredEndpoints(message) - } - } else { - echoToDesiredEndpoints(message) - } - } - - /** Sends message to echo after determining whether to use Logcat and/or systrace. */ - private fun echoToDesiredEndpoints(message: LogMessage) { - val includeInLogcat = - logcatEchoTracker.isBufferLoggable(name, message.level) || - logcatEchoTracker.isTagLoggable(message.tag, message.level) - echo(message, toLogcat = includeInLogcat, toSystrace = systrace) - } - - /** Converts the entire buffer to a newline-delimited string */ - @Synchronized - fun dump(pw: PrintWriter, tailLength: Int) { - val iterationStart = - if (tailLength <= 0) { - 0 - } else { - max(0, buffer.size - tailLength) - } - - for (i in iterationStart until buffer.size) { - buffer[i].dump(pw) - } - } - - /** - * "Freezes" the contents of the buffer, making it immutable until [unfreeze] is called. Calls - * to [log], [obtain], and [commit] will not affect the buffer and will return dummy values if - * necessary. - */ - @Synchronized - fun freeze() { - if (!frozen) { - log(TAG, LogLevel.DEBUG, { str1 = name }, { "$str1 frozen" }) - frozen = true - } - } - - /** Undoes the effects of calling [freeze]. */ - @Synchronized - fun unfreeze() { - if (frozen) { - frozen = false - log(TAG, LogLevel.DEBUG, { str1 = name }, { "$str1 unfrozen" }) - } - } - - private fun echo(message: LogMessage, toLogcat: Boolean, toSystrace: Boolean) { - if (toLogcat || toSystrace) { - val strMessage = message.messagePrinter(message) - if (toSystrace) { - echoToSystrace(message, strMessage) - } - if (toLogcat) { - echoToLogcat(message, strMessage) - } - } - } - - private fun echoToSystrace(message: LogMessage, strMessage: String) { - Trace.instantForTrack( - Trace.TRACE_TAG_APP, - "UI Events", - "$name - ${message.level.shortString} ${message.tag}: $strMessage" - ) - } - - private fun echoToLogcat(message: LogMessage, strMessage: String) { - when (message.level) { - LogLevel.VERBOSE -> Log.v(message.tag, strMessage, message.exception) - LogLevel.DEBUG -> Log.d(message.tag, strMessage, message.exception) - LogLevel.INFO -> Log.i(message.tag, strMessage, message.exception) - LogLevel.WARNING -> Log.w(message.tag, strMessage, message.exception) - LogLevel.ERROR -> Log.e(message.tag, strMessage, message.exception) - LogLevel.WTF -> Log.wtf(message.tag, strMessage, message.exception) - } - } -} - -/** - * A function that will be called immediately to store relevant data on the log message. The value - * of `this` will be the LogMessage to be initialized. - */ -typealias MessageInitializer = LogMessage.() -> Unit - -private const val TAG = "LogBuffer" -private val FROZEN_MESSAGE = LogMessageImpl.create() diff --git a/packages/SystemUI/plugin/src/com/android/systemui/plugins/log/LogLevel.kt b/packages/SystemUI/plugin/src/com/android/systemui/plugins/log/LogLevel.kt deleted file mode 100644 index b036cf0be1d6..000000000000 --- a/packages/SystemUI/plugin/src/com/android/systemui/plugins/log/LogLevel.kt +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (C) 2020 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.plugins.log - -import android.util.Log - -/** Enum version of @Log.Level */ -enum class LogLevel(@Log.Level val nativeLevel: Int, val shortString: String) { - VERBOSE(Log.VERBOSE, "V"), - DEBUG(Log.DEBUG, "D"), - INFO(Log.INFO, "I"), - WARNING(Log.WARN, "W"), - ERROR(Log.ERROR, "E"), - WTF(Log.ASSERT, "WTF") -} diff --git a/packages/SystemUI/plugin/src/com/android/systemui/plugins/log/LogMessage.kt b/packages/SystemUI/plugin/src/com/android/systemui/plugins/log/LogMessage.kt deleted file mode 100644 index 9468681289bf..000000000000 --- a/packages/SystemUI/plugin/src/com/android/systemui/plugins/log/LogMessage.kt +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Copyright (C) 2020 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.plugins.log - -import java.io.PrintWriter -import java.text.SimpleDateFormat -import java.util.Locale - -/** - * Generic data class for storing messages logged to a [LogBuffer] - * - * Each LogMessage has a few standard fields ([level], [tag], and [timestamp]). The rest are generic - * data slots that may or may not be used, depending on the nature of the specific message being - * logged. - * - * When a message is logged, the code doing the logging stores data in one or more of the generic - * fields ([str1], [int1], etc). When it comes time to dump the message to logcat/bugreport/etc, the - * [messagePrinter] function reads the data stored in the generic fields and converts that to a - * human- readable string. Thus, for every log type there must be a specialized initializer function - * that stores data specific to that log type and a specialized printer function that prints that - * data. - * - * See [LogBuffer.log] for more information. - */ -interface LogMessage { - val level: LogLevel - val tag: String - val timestamp: Long - val messagePrinter: MessagePrinter - val exception: Throwable? - - var str1: String? - var str2: String? - var str3: String? - var int1: Int - var int2: Int - var long1: Long - var long2: Long - var double1: Double - var bool1: Boolean - var bool2: Boolean - var bool3: Boolean - var bool4: Boolean - - /** Function that dumps the [LogMessage] to the provided [writer]. */ - fun dump(writer: PrintWriter) { - val formattedTimestamp = DATE_FORMAT.format(timestamp) - val shortLevel = level.shortString - val messageToPrint = messagePrinter(this) - printLikeLogcat(writer, formattedTimestamp, shortLevel, tag, messageToPrint) - exception?.printStackTrace(writer) - } -} - -/** - * A function that will be called if and when the message needs to be dumped to logcat or a bug - * report. It should read the data stored by the initializer and convert it to a human-readable - * string. The value of `this` will be the LogMessage to be printed. **IMPORTANT:** The printer - * should ONLY ever reference fields on the LogMessage and NEVER any variables in its enclosing - * scope. Otherwise, the runtime will need to allocate a new instance of the printer for each call, - * thwarting our attempts at avoiding any sort of allocation. - */ -typealias MessagePrinter = LogMessage.() -> String - -private fun printLikeLogcat( - pw: PrintWriter, - formattedTimestamp: String, - shortLogLevel: String, - tag: String, - message: String -) { - pw.print(formattedTimestamp) - pw.print(" ") - pw.print(shortLogLevel) - pw.print(" ") - pw.print(tag) - pw.print(": ") - pw.println(message) -} - -private val DATE_FORMAT = SimpleDateFormat("MM-dd HH:mm:ss.SSS", Locale.US) diff --git a/packages/SystemUI/plugin/src/com/android/systemui/plugins/log/LogMessageImpl.kt b/packages/SystemUI/plugin/src/com/android/systemui/plugins/log/LogMessageImpl.kt deleted file mode 100644 index f2a6a91adcdf..000000000000 --- a/packages/SystemUI/plugin/src/com/android/systemui/plugins/log/LogMessageImpl.kt +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Copyright (C) 2020 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.plugins.log - -/** Recyclable implementation of [LogMessage]. */ -data class LogMessageImpl( - override var level: LogLevel, - override var tag: String, - override var timestamp: Long, - override var messagePrinter: MessagePrinter, - override var exception: Throwable?, - override var str1: String?, - override var str2: String?, - override var str3: String?, - override var int1: Int, - override var int2: Int, - override var long1: Long, - override var long2: Long, - override var double1: Double, - override var bool1: Boolean, - override var bool2: Boolean, - override var bool3: Boolean, - override var bool4: Boolean, -) : LogMessage { - - fun reset( - tag: String, - level: LogLevel, - timestamp: Long, - renderer: MessagePrinter, - exception: Throwable? = null, - ) { - this.level = level - this.tag = tag - this.timestamp = timestamp - this.messagePrinter = renderer - this.exception = exception - str1 = null - str2 = null - str3 = null - int1 = 0 - int2 = 0 - long1 = 0 - long2 = 0 - double1 = 0.0 - bool1 = false - bool2 = false - bool3 = false - bool4 = false - } - - companion object Factory { - fun create(): LogMessageImpl { - return LogMessageImpl( - LogLevel.DEBUG, - DEFAULT_TAG, - 0, - DEFAULT_PRINTER, - null, - null, - null, - null, - 0, - 0, - 0, - 0, - 0.0, - false, - false, - false, - false - ) - } - } -} - -private const val DEFAULT_TAG = "UnknownTag" -private val DEFAULT_PRINTER: MessagePrinter = { "Unknown message: $this" } diff --git a/packages/SystemUI/plugin/src/com/android/systemui/plugins/log/LogcatEchoTracker.kt b/packages/SystemUI/plugin/src/com/android/systemui/plugins/log/LogcatEchoTracker.kt deleted file mode 100644 index cfe894f276a0..000000000000 --- a/packages/SystemUI/plugin/src/com/android/systemui/plugins/log/LogcatEchoTracker.kt +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (C) 2020 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.plugins.log - -/** Keeps track of which [LogBuffer] messages should also appear in logcat. */ -interface LogcatEchoTracker { - /** Whether [bufferName] should echo messages of [level] or higher to logcat. */ - fun isBufferLoggable(bufferName: String, level: LogLevel): Boolean - - /** Whether [tagName] should echo messages of [level] or higher to logcat. */ - fun isTagLoggable(tagName: String, level: LogLevel): Boolean - - /** Whether to log messages in a background thread. */ - val logInBackgroundThread: Boolean -} diff --git a/packages/SystemUI/plugin/src/com/android/systemui/plugins/log/LogcatEchoTrackerDebug.kt b/packages/SystemUI/plugin/src/com/android/systemui/plugins/log/LogcatEchoTrackerDebug.kt deleted file mode 100644 index 7a125ac14ea1..000000000000 --- a/packages/SystemUI/plugin/src/com/android/systemui/plugins/log/LogcatEchoTrackerDebug.kt +++ /dev/null @@ -1,139 +0,0 @@ -/* - * Copyright (C) 2020 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.plugins.log - -import android.content.ContentResolver -import android.database.ContentObserver -import android.net.Uri -import android.os.Handler -import android.os.Looper -import android.os.Trace -import android.provider.Settings - -/** - * Version of [LogcatEchoTracker] for debuggable builds - * - * The log level of individual buffers or tags can be controlled via global settings: - * ``` - * # Echo any message to of or higher - * $ adb shell settings put global systemui/buffer/ - * - * # Echo any message of and of or higher - * $ adb shell settings put global systemui/tag/ - * ``` - */ -class LogcatEchoTrackerDebug private constructor(private val contentResolver: ContentResolver) : - LogcatEchoTracker { - private val cachedBufferLevels: MutableMap = mutableMapOf() - private val cachedTagLevels: MutableMap = mutableMapOf() - override val logInBackgroundThread = true - - companion object Factory { - @JvmStatic - fun create(contentResolver: ContentResolver, mainLooper: Looper): LogcatEchoTrackerDebug { - val tracker = LogcatEchoTrackerDebug(contentResolver) - tracker.attach(mainLooper) - return tracker - } - } - - private fun clearCache() { - Trace.beginSection("LogcatEchoTrackerDebug#clearCache") - cachedBufferLevels.clear() - Trace.endSection() - } - - private fun attach(mainLooper: Looper) { - Trace.beginSection("LogcatEchoTrackerDebug#attach") - contentResolver.registerContentObserver( - Settings.Global.getUriFor(BUFFER_PATH), - true, - object : ContentObserver(Handler(mainLooper)) { - override fun onChange(selfChange: Boolean, uri: Uri?) { - super.onChange(selfChange, uri) - clearCache() - } - } - ) - - contentResolver.registerContentObserver( - Settings.Global.getUriFor(TAG_PATH), - true, - object : ContentObserver(Handler(mainLooper)) { - override fun onChange(selfChange: Boolean, uri: Uri?) { - super.onChange(selfChange, uri) - clearCache() - } - } - ) - Trace.endSection() - } - - /** Whether [bufferName] should echo messages of [level] or higher to logcat. */ - @Synchronized - override fun isBufferLoggable(bufferName: String, level: LogLevel): Boolean { - return level.ordinal >= getLogLevel(bufferName, BUFFER_PATH, cachedBufferLevels).ordinal - } - - /** Whether [tagName] should echo messages of [level] or higher to logcat. */ - @Synchronized - override fun isTagLoggable(tagName: String, level: LogLevel): Boolean { - return level >= getLogLevel(tagName, TAG_PATH, cachedTagLevels) - } - - private fun getLogLevel( - name: String, - path: String, - cache: MutableMap - ): LogLevel { - return cache[name] ?: readSetting("$path/$name").also { cache[name] = it } - } - - private fun readSetting(path: String): LogLevel { - return try { - Trace.beginSection("LogcatEchoTrackerDebug#readSetting") - parseProp(Settings.Global.getString(contentResolver, path)) - } catch (_: Settings.SettingNotFoundException) { - DEFAULT_LEVEL - } finally { - Trace.endSection() - } - } - - private fun parseProp(propValue: String?): LogLevel { - return when (propValue?.lowercase()) { - "verbose" -> LogLevel.VERBOSE - "v" -> LogLevel.VERBOSE - "debug" -> LogLevel.DEBUG - "d" -> LogLevel.DEBUG - "info" -> LogLevel.INFO - "i" -> LogLevel.INFO - "warning" -> LogLevel.WARNING - "warn" -> LogLevel.WARNING - "w" -> LogLevel.WARNING - "error" -> LogLevel.ERROR - "e" -> LogLevel.ERROR - "assert" -> LogLevel.WTF - "wtf" -> LogLevel.WTF - else -> DEFAULT_LEVEL - } - } -} - -private val DEFAULT_LEVEL = LogLevel.WARNING -private const val BUFFER_PATH = "systemui/buffer" -private const val TAG_PATH = "systemui/tag" diff --git a/packages/SystemUI/plugin/src/com/android/systemui/plugins/log/LogcatEchoTrackerProd.kt b/packages/SystemUI/plugin/src/com/android/systemui/plugins/log/LogcatEchoTrackerProd.kt deleted file mode 100644 index 3c8bda4a44e0..000000000000 --- a/packages/SystemUI/plugin/src/com/android/systemui/plugins/log/LogcatEchoTrackerProd.kt +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (C) 2020 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.plugins.log - -/** Production version of [LogcatEchoTracker] that isn't configurable. */ -class LogcatEchoTrackerProd : LogcatEchoTracker { - override val logInBackgroundThread = false - - override fun isBufferLoggable(bufferName: String, level: LogLevel): Boolean { - return level >= LogLevel.WARNING - } - - override fun isTagLoggable(tagName: String, level: LogLevel): Boolean { - return level >= LogLevel.WARNING - } -} diff --git a/packages/SystemUI/plugin/tests/log/LogBufferTest.kt b/packages/SystemUI/plugin/tests/log/LogBufferTest.kt deleted file mode 100644 index a39b856f0f49..000000000000 --- a/packages/SystemUI/plugin/tests/log/LogBufferTest.kt +++ /dev/null @@ -1,138 +0,0 @@ -package com.android.systemui.log - -import androidx.test.filters.SmallTest -import com.android.systemui.SysuiTestCase -import com.android.systemui.plugins.log.LogBuffer -import com.google.common.truth.Truth.assertThat -import java.io.PrintWriter -import java.io.StringWriter -import org.junit.Before -import org.junit.Test -import org.junit.runner.RunWith -import org.mockito.Mock -import org.mockito.junit.MockitoJUnitRunner - -@SmallTest -@RunWith(MockitoJUnitRunner::class) -class LogBufferTest : SysuiTestCase() { - private lateinit var buffer: LogBuffer - - private lateinit var outputWriter: StringWriter - - @Mock private lateinit var logcatEchoTracker: LogcatEchoTracker - - @Before - fun setup() { - outputWriter = StringWriter() - buffer = createBuffer() - } - - private fun createBuffer(): LogBuffer { - return LogBuffer("TestBuffer", 1, logcatEchoTracker, false) - } - - @Test - fun log_shouldSaveLogToBuffer() { - buffer.log("Test", LogLevel.INFO, "Some test message") - - val dumpedString = dumpBuffer() - - assertThat(dumpedString).contains("Some test message") - } - - @Test - fun log_shouldRotateIfLogBufferIsFull() { - buffer.log("Test", LogLevel.INFO, "This should be rotated") - buffer.log("Test", LogLevel.INFO, "New test message") - - val dumpedString = dumpBuffer() - - assertThat(dumpedString).contains("New test message") - } - - @Test - fun dump_writesExceptionAndStacktrace() { - buffer = createBuffer() - val exception = createTestException("Exception message", "TestClass") - buffer.log("Tag", LogLevel.ERROR, { str1 = "Extra message" }, { str1!! }, exception) - - val dumpedString = dumpBuffer() - - assertThat(dumpedString).contains("Extra message") - assertThat(dumpedString).contains("java.lang.RuntimeException: Exception message") - assertThat(dumpedString).contains("at TestClass.TestMethod(TestClass.java:1)") - assertThat(dumpedString).contains("at TestClass.TestMethod(TestClass.java:2)") - } - - @Test - fun dump_writesCauseAndStacktrace() { - buffer = createBuffer() - val exception = - createTestException( - "Exception message", - "TestClass", - cause = createTestException("The real cause!", "TestClass") - ) - buffer.log("Tag", LogLevel.ERROR, { str1 = "Extra message" }, { str1!! }, exception) - - val dumpedString = dumpBuffer() - - assertThat(dumpedString).contains("Caused by: java.lang.RuntimeException: The real cause!") - assertThat(dumpedString).contains("at TestClass.TestMethod(TestClass.java:1)") - assertThat(dumpedString).contains("at TestClass.TestMethod(TestClass.java:2)") - } - - @Test - fun dump_writesSuppressedExceptionAndStacktrace() { - buffer = createBuffer() - val exception = RuntimeException("Root exception message") - exception.addSuppressed( - createTestException( - "First suppressed exception", - "FirstClass", - createTestException("Cause of suppressed exp", "ThirdClass") - ) - ) - exception.addSuppressed(createTestException("Second suppressed exception", "SecondClass")) - buffer.log("Tag", LogLevel.ERROR, { str1 = "Extra message" }, { str1!! }, exception) - - val dumpedStr = dumpBuffer() - - // first suppressed exception - assertThat(dumpedStr) - .contains("Suppressed: " + "java.lang.RuntimeException: First suppressed exception") - assertThat(dumpedStr).contains("at FirstClass.TestMethod(FirstClass.java:1)") - assertThat(dumpedStr).contains("at FirstClass.TestMethod(FirstClass.java:2)") - - assertThat(dumpedStr) - .contains("Caused by: java.lang.RuntimeException: Cause of suppressed exp") - assertThat(dumpedStr).contains("at ThirdClass.TestMethod(ThirdClass.java:1)") - assertThat(dumpedStr).contains("at ThirdClass.TestMethod(ThirdClass.java:2)") - - // second suppressed exception - assertThat(dumpedStr) - .contains("Suppressed: " + "java.lang.RuntimeException: Second suppressed exception") - assertThat(dumpedStr).contains("at SecondClass.TestMethod(SecondClass.java:1)") - assertThat(dumpedStr).contains("at SecondClass.TestMethod(SecondClass.java:2)") - } - - private fun createTestException( - message: String, - errorClass: String, - cause: Throwable? = null, - ): Exception { - val exception = RuntimeException(message, cause) - exception.stackTrace = - (1..5) - .map { lineNumber -> - StackTraceElement(errorClass, "TestMethod", "$errorClass.java", lineNumber) - } - .toTypedArray() - return exception - } - - private fun dumpBuffer(): String { - buffer.dump(PrintWriter(outputWriter), tailLength = 100) - return outputWriter.toString() - } -} diff --git a/packages/SystemUI/src/com/android/keyguard/ClockEventController.kt b/packages/SystemUI/src/com/android/keyguard/ClockEventController.kt index 8b87e2a538ca..4bf7be6df5be 100644 --- a/packages/SystemUI/src/com/android/keyguard/ClockEventController.kt +++ b/packages/SystemUI/src/com/android/keyguard/ClockEventController.kt @@ -42,14 +42,14 @@ import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor import com.android.systemui.keyguard.shared.model.TransitionState import com.android.systemui.lifecycle.repeatWhenAttached +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel.DEBUG import com.android.systemui.log.dagger.KeyguardLargeClockLog import com.android.systemui.log.dagger.KeyguardSmallClockLog import com.android.systemui.plugins.ClockController import com.android.systemui.plugins.ClockFaceController import com.android.systemui.plugins.ClockTickRate import com.android.systemui.plugins.WeatherData -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel.DEBUG import com.android.systemui.shared.regionsampling.RegionSampler import com.android.systemui.statusbar.policy.BatteryController import com.android.systemui.statusbar.policy.BatteryController.BatteryStateChangeCallback diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java index a6c782d88e18..4629e8b19ae5 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java @@ -18,9 +18,9 @@ import androidx.annotation.VisibleForTesting; import com.android.keyguard.dagger.KeyguardStatusViewScope; import com.android.systemui.R; import com.android.systemui.animation.Interpolators; +import com.android.systemui.log.LogBuffer; +import com.android.systemui.log.LogLevel; import com.android.systemui.plugins.ClockController; -import com.android.systemui.plugins.log.LogBuffer; -import com.android.systemui.plugins.log.LogLevel; import java.io.PrintWriter; import java.lang.annotation.Retention; diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java index a34c9fa5aced..50dac32d67d7 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java @@ -39,10 +39,10 @@ import com.android.systemui.R; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.dump.DumpManager; import com.android.systemui.keyguard.KeyguardUnlockAnimationController; +import com.android.systemui.log.LogBuffer; +import com.android.systemui.log.LogLevel; import com.android.systemui.log.dagger.KeyguardClockLog; import com.android.systemui.plugins.ClockController; -import com.android.systemui.plugins.log.LogBuffer; -import com.android.systemui.plugins.log.LogLevel; import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.shared.clocks.ClockRegistry; import com.android.systemui.shared.regionsampling.RegionSampler; diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardVisibilityHelper.java b/packages/SystemUI/src/com/android/keyguard/KeyguardVisibilityHelper.java index 651c9796140e..d8568ba56ebc 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardVisibilityHelper.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardVisibilityHelper.java @@ -22,8 +22,8 @@ import android.util.Property; import android.view.View; import com.android.systemui.animation.Interpolators; -import com.android.systemui.plugins.log.LogBuffer; -import com.android.systemui.plugins.log.LogLevel; +import com.android.systemui.log.LogBuffer; +import com.android.systemui.log.LogLevel; import com.android.systemui.statusbar.StatusBarState; import com.android.systemui.statusbar.notification.AnimatableProperty; import com.android.systemui.statusbar.notification.PropertyAnimator; diff --git a/packages/SystemUI/src/com/android/keyguard/dagger/ClockRegistryModule.java b/packages/SystemUI/src/com/android/keyguard/dagger/ClockRegistryModule.java index 6740375c4329..2d0bf9cc2aba 100644 --- a/packages/SystemUI/src/com/android/keyguard/dagger/ClockRegistryModule.java +++ b/packages/SystemUI/src/com/android/keyguard/dagger/ClockRegistryModule.java @@ -27,9 +27,9 @@ import com.android.systemui.dagger.qualifiers.Background; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.flags.FeatureFlags; import com.android.systemui.flags.Flags; +import com.android.systemui.log.LogBuffer; import com.android.systemui.log.dagger.KeyguardClockLog; import com.android.systemui.plugins.PluginManager; -import com.android.systemui.plugins.log.LogBuffer; import com.android.systemui.shared.clocks.ClockRegistry; import com.android.systemui.shared.clocks.DefaultClockProvider; diff --git a/packages/SystemUI/src/com/android/keyguard/logging/BiometricMessageDeferralLogger.kt b/packages/SystemUI/src/com/android/keyguard/logging/BiometricMessageDeferralLogger.kt index 2bb75aa34c6a..e7295ef9052c 100644 --- a/packages/SystemUI/src/com/android/keyguard/logging/BiometricMessageDeferralLogger.kt +++ b/packages/SystemUI/src/com/android/keyguard/logging/BiometricMessageDeferralLogger.kt @@ -17,9 +17,9 @@ package com.android.keyguard.logging import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel.DEBUG import com.android.systemui.log.dagger.BiometricLog -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel.DEBUG import javax.inject.Inject /** Helper class for logging for [com.android.systemui.biometrics.FaceHelpMessageDeferral] */ diff --git a/packages/SystemUI/src/com/android/keyguard/logging/BiometricUnlockLogger.kt b/packages/SystemUI/src/com/android/keyguard/logging/BiometricUnlockLogger.kt index 20f90072161b..c00b2c612fa2 100644 --- a/packages/SystemUI/src/com/android/keyguard/logging/BiometricUnlockLogger.kt +++ b/packages/SystemUI/src/com/android/keyguard/logging/BiometricUnlockLogger.kt @@ -18,11 +18,11 @@ package com.android.keyguard.logging import android.hardware.biometrics.BiometricSourceType import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel +import com.android.systemui.log.LogLevel.DEBUG +import com.android.systemui.log.LogLevel.INFO import com.android.systemui.log.dagger.BiometricLog -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel -import com.android.systemui.plugins.log.LogLevel.DEBUG -import com.android.systemui.plugins.log.LogLevel.INFO import com.android.systemui.statusbar.phone.BiometricUnlockController.MODE_DISMISS_BOUNCER import com.android.systemui.statusbar.phone.BiometricUnlockController.MODE_NONE import com.android.systemui.statusbar.phone.BiometricUnlockController.MODE_ONLY_WAKE diff --git a/packages/SystemUI/src/com/android/keyguard/logging/KeyguardLogger.kt b/packages/SystemUI/src/com/android/keyguard/logging/KeyguardLogger.kt index 4d71a8952021..8b925b1bfb54 100644 --- a/packages/SystemUI/src/com/android/keyguard/logging/KeyguardLogger.kt +++ b/packages/SystemUI/src/com/android/keyguard/logging/KeyguardLogger.kt @@ -18,9 +18,9 @@ package com.android.keyguard.logging import com.android.systemui.biometrics.AuthRippleController import com.android.systemui.keyguard.KeyguardIndicationRotateTextViewController +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel import com.android.systemui.log.dagger.KeyguardLog -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel import com.android.systemui.statusbar.KeyguardIndicationController import com.google.errorprone.annotations.CompileTimeConstant import javax.inject.Inject diff --git a/packages/SystemUI/src/com/android/keyguard/logging/KeyguardUpdateMonitorLogger.kt b/packages/SystemUI/src/com/android/keyguard/logging/KeyguardUpdateMonitorLogger.kt index 4974f797d59a..c2d22c3e1d14 100644 --- a/packages/SystemUI/src/com/android/keyguard/logging/KeyguardUpdateMonitorLogger.kt +++ b/packages/SystemUI/src/com/android/keyguard/logging/KeyguardUpdateMonitorLogger.kt @@ -27,13 +27,13 @@ import com.android.keyguard.KeyguardListenModel import com.android.keyguard.KeyguardUpdateMonitorCallback import com.android.keyguard.TrustGrantFlags import com.android.systemui.log.dagger.KeyguardUpdateMonitorLog -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel -import com.android.systemui.plugins.log.LogLevel.DEBUG -import com.android.systemui.plugins.log.LogLevel.ERROR -import com.android.systemui.plugins.log.LogLevel.INFO -import com.android.systemui.plugins.log.LogLevel.VERBOSE -import com.android.systemui.plugins.log.LogLevel.WARNING +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel +import com.android.systemui.log.LogLevel.DEBUG +import com.android.systemui.log.LogLevel.ERROR +import com.android.systemui.log.LogLevel.INFO +import com.android.systemui.log.LogLevel.VERBOSE +import com.android.systemui.log.LogLevel.WARNING import com.google.errorprone.annotations.CompileTimeConstant import javax.inject.Inject diff --git a/packages/SystemUI/src/com/android/keyguard/logging/TrustRepositoryLogger.kt b/packages/SystemUI/src/com/android/keyguard/logging/TrustRepositoryLogger.kt index 249b3fe97d81..daafea8b62c7 100644 --- a/packages/SystemUI/src/com/android/keyguard/logging/TrustRepositoryLogger.kt +++ b/packages/SystemUI/src/com/android/keyguard/logging/TrustRepositoryLogger.kt @@ -18,9 +18,9 @@ package com.android.keyguard.logging import com.android.systemui.dagger.SysUISingleton import com.android.systemui.keyguard.shared.model.TrustModel +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel import com.android.systemui.log.dagger.KeyguardUpdateMonitorLog -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel import javax.inject.Inject /** Logging helper for trust repository. */ diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthRippleController.kt b/packages/SystemUI/src/com/android/systemui/biometrics/AuthRippleController.kt index d0ac2968ae8e..55f6d072563b 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthRippleController.kt +++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthRippleController.kt @@ -37,7 +37,7 @@ import com.android.systemui.dagger.SysUISingleton import com.android.systemui.flags.FeatureFlags import com.android.systemui.flags.Flags import com.android.systemui.keyguard.WakefulnessLifecycle -import com.android.systemui.plugins.log.LogLevel +import com.android.systemui.log.LogLevel import com.android.systemui.plugins.statusbar.StatusBarStateController import com.android.systemui.statusbar.CircleReveal import com.android.systemui.statusbar.LiftReveal diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsLogger.kt b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsLogger.kt index 0d08b4307f12..39199d194cc9 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsLogger.kt @@ -16,12 +16,12 @@ package com.android.systemui.biometrics +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel +import com.android.systemui.log.LogLevel.ERROR +import com.android.systemui.log.LogLevel.VERBOSE +import com.android.systemui.log.LogLevel.WARNING import com.android.systemui.log.dagger.UdfpsLog -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel -import com.android.systemui.plugins.log.LogLevel.ERROR -import com.android.systemui.plugins.log.LogLevel.VERBOSE -import com.android.systemui.plugins.log.LogLevel.WARNING import com.google.errorprone.annotations.CompileTimeConstant import javax.inject.Inject diff --git a/packages/SystemUI/src/com/android/systemui/bluetooth/BluetoothLogger.kt b/packages/SystemUI/src/com/android/systemui/bluetooth/BluetoothLogger.kt index d99625a9fbf2..96af42bfda22 100644 --- a/packages/SystemUI/src/com/android/systemui/bluetooth/BluetoothLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/bluetooth/BluetoothLogger.kt @@ -17,9 +17,9 @@ package com.android.systemui.bluetooth import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel import com.android.systemui.log.dagger.BluetoothLog -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel import javax.inject.Inject /** Helper class for logging bluetooth events. */ diff --git a/packages/SystemUI/src/com/android/systemui/broadcast/logging/BroadcastDispatcherLogger.kt b/packages/SystemUI/src/com/android/systemui/broadcast/logging/BroadcastDispatcherLogger.kt index d27708fc04d7..5b3a982ab5e2 100644 --- a/packages/SystemUI/src/com/android/systemui/broadcast/logging/BroadcastDispatcherLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/broadcast/logging/BroadcastDispatcherLogger.kt @@ -20,11 +20,11 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import android.content.IntentFilter -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel -import com.android.systemui.plugins.log.LogLevel.DEBUG -import com.android.systemui.plugins.log.LogLevel.INFO -import com.android.systemui.plugins.log.LogMessage +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel +import com.android.systemui.log.LogLevel.DEBUG +import com.android.systemui.log.LogLevel.INFO +import com.android.systemui.log.LogMessage import com.android.systemui.log.dagger.BroadcastDispatcherLog import javax.inject.Inject diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeLogger.kt b/packages/SystemUI/src/com/android/systemui/doze/DozeLogger.kt index d19c6ec01109..536978009f71 100644 --- a/packages/SystemUI/src/com/android/systemui/doze/DozeLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/doze/DozeLogger.kt @@ -19,10 +19,10 @@ package com.android.systemui.doze import android.view.Display import com.android.systemui.doze.DozeLog.Reason import com.android.systemui.doze.DozeLog.reasonToString -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel.DEBUG -import com.android.systemui.plugins.log.LogLevel.ERROR -import com.android.systemui.plugins.log.LogLevel.INFO +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel.DEBUG +import com.android.systemui.log.LogLevel.ERROR +import com.android.systemui.log.LogLevel.INFO import com.android.systemui.log.dagger.DozeLog import com.android.systemui.statusbar.policy.DevicePostureController import com.google.errorprone.annotations.CompileTimeConstant diff --git a/packages/SystemUI/src/com/android/systemui/dreams/DreamLogger.kt b/packages/SystemUI/src/com/android/systemui/dreams/DreamLogger.kt index eb7929095a4b..fdb765130157 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/DreamLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/dreams/DreamLogger.kt @@ -16,9 +16,9 @@ package com.android.systemui.dreams +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel import com.android.systemui.log.dagger.DreamLog -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel import javax.inject.Inject /** Logs dream-related stuff to a {@link LogBuffer}. */ diff --git a/packages/SystemUI/src/com/android/systemui/dump/DumpHandler.kt b/packages/SystemUI/src/com/android/systemui/dump/DumpHandler.kt index a2f65ba747ab..4b03fd334cb5 100644 --- a/packages/SystemUI/src/com/android/systemui/dump/DumpHandler.kt +++ b/packages/SystemUI/src/com/android/systemui/dump/DumpHandler.kt @@ -24,7 +24,7 @@ import com.android.systemui.R import com.android.systemui.dump.DumpHandler.Companion.PRIORITY_ARG_CRITICAL import com.android.systemui.dump.DumpHandler.Companion.PRIORITY_ARG_NORMAL import com.android.systemui.dump.nano.SystemUIProtoDump -import com.android.systemui.plugins.log.LogBuffer +import com.android.systemui.log.LogBuffer import com.android.systemui.shared.system.UncaughtExceptionPreHandlerManager import com.google.protobuf.nano.MessageNano import java.io.BufferedOutputStream diff --git a/packages/SystemUI/src/com/android/systemui/dump/DumpManager.kt b/packages/SystemUI/src/com/android/systemui/dump/DumpManager.kt index 7d1ffca88d9f..1e01c9cfd6a5 100644 --- a/packages/SystemUI/src/com/android/systemui/dump/DumpManager.kt +++ b/packages/SystemUI/src/com/android/systemui/dump/DumpManager.kt @@ -20,7 +20,7 @@ import android.util.ArrayMap import com.android.systemui.Dumpable import com.android.systemui.ProtoDumpable import com.android.systemui.dump.nano.SystemUIProtoDump -import com.android.systemui.plugins.log.LogBuffer +import com.android.systemui.log.LogBuffer import java.io.PrintWriter import javax.inject.Inject import javax.inject.Singleton diff --git a/packages/SystemUI/src/com/android/systemui/dump/LogBufferEulogizer.kt b/packages/SystemUI/src/com/android/systemui/dump/LogBufferEulogizer.kt index 8299b13d305f..0eab1afc4119 100644 --- a/packages/SystemUI/src/com/android/systemui/dump/LogBufferEulogizer.kt +++ b/packages/SystemUI/src/com/android/systemui/dump/LogBufferEulogizer.kt @@ -19,7 +19,7 @@ package com.android.systemui.dump import android.content.Context import android.util.Log import com.android.systemui.dagger.SysUISingleton -import com.android.systemui.plugins.log.LogBuffer +import com.android.systemui.log.LogBuffer import com.android.systemui.util.io.Files import com.android.systemui.util.time.SystemClock import java.io.IOException diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionAuditLogger.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionAuditLogger.kt index e650b9fc0e47..7c5641fcda9c 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionAuditLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionAuditLogger.kt @@ -19,7 +19,7 @@ package com.android.systemui.keyguard.domain.interactor import com.android.keyguard.logging.KeyguardLogger import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application -import com.android.systemui.plugins.log.LogLevel.VERBOSE +import com.android.systemui.log.LogLevel.VERBOSE import javax.inject.Inject import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch diff --git a/packages/SystemUI/src/com/android/systemui/log/FaceAuthenticationLogger.kt b/packages/SystemUI/src/com/android/systemui/log/FaceAuthenticationLogger.kt index 8e9328117e38..fefa1b29b576 100644 --- a/packages/SystemUI/src/com/android/systemui/log/FaceAuthenticationLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/log/FaceAuthenticationLogger.kt @@ -6,9 +6,8 @@ import com.android.keyguard.FaceAuthUiEvent import com.android.systemui.dagger.SysUISingleton import com.android.systemui.keyguard.shared.model.ErrorAuthenticationStatus import com.android.systemui.keyguard.shared.model.TransitionStep +import com.android.systemui.log.LogLevel.DEBUG import com.android.systemui.log.dagger.FaceAuthLog -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel.DEBUG import javax.inject.Inject private const val TAG = "DeviceEntryFaceAuthRepositoryLog" diff --git a/packages/SystemUI/src/com/android/systemui/log/LogBufferFactory.kt b/packages/SystemUI/src/com/android/systemui/log/LogBufferFactory.kt index d6e29e0f2067..e4465acb14ab 100644 --- a/packages/SystemUI/src/com/android/systemui/log/LogBufferFactory.kt +++ b/packages/SystemUI/src/com/android/systemui/log/LogBufferFactory.kt @@ -19,9 +19,6 @@ package com.android.systemui.log import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dump.DumpManager import com.android.systemui.log.LogBufferHelper.Companion.adjustMaxSize -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogcatEchoTracker - import javax.inject.Inject @SysUISingleton diff --git a/packages/SystemUI/src/com/android/systemui/log/ScreenDecorationsLogger.kt b/packages/SystemUI/src/com/android/systemui/log/ScreenDecorationsLogger.kt index 4300f371e2e1..f7277842c026 100644 --- a/packages/SystemUI/src/com/android/systemui/log/ScreenDecorationsLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/log/ScreenDecorationsLogger.kt @@ -21,10 +21,10 @@ import android.graphics.Rect import android.graphics.RectF import androidx.core.graphics.toRectF import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel.DEBUG +import com.android.systemui.log.LogLevel.ERROR import com.android.systemui.log.dagger.ScreenDecorationsLog -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel.DEBUG -import com.android.systemui.plugins.log.LogLevel.ERROR import com.google.errorprone.annotations.CompileTimeConstant import javax.inject.Inject diff --git a/packages/SystemUI/src/com/android/systemui/log/dagger/BiometricLog.java b/packages/SystemUI/src/com/android/systemui/log/dagger/BiometricLog.java index 4b774d3b2192..233f7a123ff4 100644 --- a/packages/SystemUI/src/com/android/systemui/log/dagger/BiometricLog.java +++ b/packages/SystemUI/src/com/android/systemui/log/dagger/BiometricLog.java @@ -23,7 +23,7 @@ import java.lang.annotation.RetentionPolicy; import javax.inject.Qualifier; /** - * A {@link com.android.systemui.plugins.log.LogBuffer} for BiometricMessages processing such as + * A {@link com.android.systemui.log.LogBuffer} for BiometricMessages processing such as * {@link com.android.systemui.biometrics.FaceHelpMessageDeferral} */ @Qualifier diff --git a/packages/SystemUI/src/com/android/systemui/log/dagger/BroadcastDispatcherLog.java b/packages/SystemUI/src/com/android/systemui/log/dagger/BroadcastDispatcherLog.java index 5cca1ab2abe7..7d1f1c2709fa 100644 --- a/packages/SystemUI/src/com/android/systemui/log/dagger/BroadcastDispatcherLog.java +++ b/packages/SystemUI/src/com/android/systemui/log/dagger/BroadcastDispatcherLog.java @@ -18,7 +18,7 @@ package com.android.systemui.log.dagger; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import com.android.systemui.plugins.log.LogBuffer; +import com.android.systemui.log.LogBuffer; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/packages/SystemUI/src/com/android/systemui/log/dagger/CollapsedSbFragmentLog.java b/packages/SystemUI/src/com/android/systemui/log/dagger/CollapsedSbFragmentLog.java index 1d016d837b02..9ca0293fbd86 100644 --- a/packages/SystemUI/src/com/android/systemui/log/dagger/CollapsedSbFragmentLog.java +++ b/packages/SystemUI/src/com/android/systemui/log/dagger/CollapsedSbFragmentLog.java @@ -18,7 +18,7 @@ package com.android.systemui.log.dagger; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import com.android.systemui.plugins.log.LogBuffer; +import com.android.systemui.log.LogBuffer; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/packages/SystemUI/src/com/android/systemui/log/dagger/DozeLog.java b/packages/SystemUI/src/com/android/systemui/log/dagger/DozeLog.java index c9f78bcdeef8..7c5f4025117f 100644 --- a/packages/SystemUI/src/com/android/systemui/log/dagger/DozeLog.java +++ b/packages/SystemUI/src/com/android/systemui/log/dagger/DozeLog.java @@ -18,7 +18,7 @@ package com.android.systemui.log.dagger; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import com.android.systemui.plugins.log.LogBuffer; +import com.android.systemui.log.LogBuffer; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/packages/SystemUI/src/com/android/systemui/log/dagger/KeyguardClockLog.kt b/packages/SystemUI/src/com/android/systemui/log/dagger/KeyguardClockLog.kt index 9f563fe4eae5..8732ef576335 100644 --- a/packages/SystemUI/src/com/android/systemui/log/dagger/KeyguardClockLog.kt +++ b/packages/SystemUI/src/com/android/systemui/log/dagger/KeyguardClockLog.kt @@ -18,19 +18,19 @@ package com.android.systemui.log.dagger import javax.inject.Qualifier -/** A [com.android.systemui.plugins.log.LogBuffer] for keyguard clock logs. */ +/** A [com.android.systemui.log.LogBuffer] for keyguard clock logs. */ @Qualifier @MustBeDocumented @Retention(AnnotationRetention.RUNTIME) annotation class KeyguardClockLog -/** A [com.android.systemui.plugins.log.LogBuffer] for small keyguard clock logs. */ +/** A [com.android.systemui.log.LogBuffer] for small keyguard clock logs. */ @Qualifier @MustBeDocumented @Retention(AnnotationRetention.RUNTIME) annotation class KeyguardSmallClockLog -/** A [com.android.systemui.plugins.log.LogBuffer] for large keyguard clock logs. */ +/** A [com.android.systemui.log.LogBuffer] for large keyguard clock logs. */ @Qualifier @MustBeDocumented @Retention(AnnotationRetention.RUNTIME) diff --git a/packages/SystemUI/src/com/android/systemui/log/dagger/LSShadeTransitionLog.java b/packages/SystemUI/src/com/android/systemui/log/dagger/LSShadeTransitionLog.java index 76d20bea4bdf..08d969b5eb77 100644 --- a/packages/SystemUI/src/com/android/systemui/log/dagger/LSShadeTransitionLog.java +++ b/packages/SystemUI/src/com/android/systemui/log/dagger/LSShadeTransitionLog.java @@ -18,7 +18,7 @@ package com.android.systemui.log.dagger; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import com.android.systemui.plugins.log.LogBuffer; +import com.android.systemui.log.LogBuffer; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/packages/SystemUI/src/com/android/systemui/log/dagger/LogModule.java b/packages/SystemUI/src/com/android/systemui/log/dagger/LogModule.java index 658f6a087854..90ef8a787a10 100644 --- a/packages/SystemUI/src/com/android/systemui/log/dagger/LogModule.java +++ b/packages/SystemUI/src/com/android/systemui/log/dagger/LogModule.java @@ -22,13 +22,13 @@ import android.os.Looper; import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.dagger.qualifiers.Main; +import com.android.systemui.log.LogBuffer; import com.android.systemui.log.LogBufferFactory; +import com.android.systemui.log.LogcatEchoTracker; +import com.android.systemui.log.LogcatEchoTrackerDebug; +import com.android.systemui.log.LogcatEchoTrackerProd; import com.android.systemui.log.table.TableLogBuffer; import com.android.systemui.log.table.TableLogBufferFactory; -import com.android.systemui.plugins.log.LogBuffer; -import com.android.systemui.plugins.log.LogcatEchoTracker; -import com.android.systemui.plugins.log.LogcatEchoTrackerDebug; -import com.android.systemui.plugins.log.LogcatEchoTrackerProd; import com.android.systemui.statusbar.notification.NotifPipelineFlags; import com.android.systemui.util.Compile; import com.android.systemui.util.wakelock.WakeLockLog; diff --git a/packages/SystemUI/src/com/android/systemui/log/dagger/MediaBrowserLog.java b/packages/SystemUI/src/com/android/systemui/log/dagger/MediaBrowserLog.java index af433476b38c..1c00c93f4e38 100644 --- a/packages/SystemUI/src/com/android/systemui/log/dagger/MediaBrowserLog.java +++ b/packages/SystemUI/src/com/android/systemui/log/dagger/MediaBrowserLog.java @@ -18,7 +18,7 @@ package com.android.systemui.log.dagger; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import com.android.systemui.plugins.log.LogBuffer; +import com.android.systemui.log.LogBuffer; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/packages/SystemUI/src/com/android/systemui/log/dagger/MediaCarouselControllerLog.java b/packages/SystemUI/src/com/android/systemui/log/dagger/MediaCarouselControllerLog.java index f4dac6efe371..86a916ef6541 100644 --- a/packages/SystemUI/src/com/android/systemui/log/dagger/MediaCarouselControllerLog.java +++ b/packages/SystemUI/src/com/android/systemui/log/dagger/MediaCarouselControllerLog.java @@ -18,7 +18,7 @@ package com.android.systemui.log.dagger; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import com.android.systemui.plugins.log.LogBuffer; +import com.android.systemui.log.LogBuffer; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/packages/SystemUI/src/com/android/systemui/log/dagger/MediaMuteAwaitLog.java b/packages/SystemUI/src/com/android/systemui/log/dagger/MediaMuteAwaitLog.java index 73690ab6c24d..c67d8bebe313 100644 --- a/packages/SystemUI/src/com/android/systemui/log/dagger/MediaMuteAwaitLog.java +++ b/packages/SystemUI/src/com/android/systemui/log/dagger/MediaMuteAwaitLog.java @@ -18,7 +18,7 @@ package com.android.systemui.log.dagger; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import com.android.systemui.plugins.log.LogBuffer; +import com.android.systemui.log.LogBuffer; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/packages/SystemUI/src/com/android/systemui/log/dagger/MediaTimeoutListenerLog.java b/packages/SystemUI/src/com/android/systemui/log/dagger/MediaTimeoutListenerLog.java index 0c2cd92d1bb0..98e6556d7f53 100644 --- a/packages/SystemUI/src/com/android/systemui/log/dagger/MediaTimeoutListenerLog.java +++ b/packages/SystemUI/src/com/android/systemui/log/dagger/MediaTimeoutListenerLog.java @@ -18,7 +18,7 @@ package com.android.systemui.log.dagger; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import com.android.systemui.plugins.log.LogBuffer; +import com.android.systemui.log.LogBuffer; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/packages/SystemUI/src/com/android/systemui/log/dagger/MediaViewLog.java b/packages/SystemUI/src/com/android/systemui/log/dagger/MediaViewLog.java index 5b7f4bb103b4..dde0ee0796d4 100644 --- a/packages/SystemUI/src/com/android/systemui/log/dagger/MediaViewLog.java +++ b/packages/SystemUI/src/com/android/systemui/log/dagger/MediaViewLog.java @@ -18,7 +18,7 @@ package com.android.systemui.log.dagger; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import com.android.systemui.plugins.log.LogBuffer; +import com.android.systemui.log.LogBuffer; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/packages/SystemUI/src/com/android/systemui/log/dagger/NearbyMediaDevicesLog.java b/packages/SystemUI/src/com/android/systemui/log/dagger/NearbyMediaDevicesLog.java index 6d91f0c97c8a..b1c6dcfcb13b 100644 --- a/packages/SystemUI/src/com/android/systemui/log/dagger/NearbyMediaDevicesLog.java +++ b/packages/SystemUI/src/com/android/systemui/log/dagger/NearbyMediaDevicesLog.java @@ -18,7 +18,7 @@ package com.android.systemui.log.dagger; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import com.android.systemui.plugins.log.LogBuffer; +import com.android.systemui.log.LogBuffer; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/packages/SystemUI/src/com/android/systemui/log/dagger/NotifInteractionLog.java b/packages/SystemUI/src/com/android/systemui/log/dagger/NotifInteractionLog.java index 26af4964f7b8..20fc6ff445a6 100644 --- a/packages/SystemUI/src/com/android/systemui/log/dagger/NotifInteractionLog.java +++ b/packages/SystemUI/src/com/android/systemui/log/dagger/NotifInteractionLog.java @@ -18,7 +18,7 @@ package com.android.systemui.log.dagger; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import com.android.systemui.plugins.log.LogBuffer; +import com.android.systemui.log.LogBuffer; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/packages/SystemUI/src/com/android/systemui/log/dagger/NotificationHeadsUpLog.java b/packages/SystemUI/src/com/android/systemui/log/dagger/NotificationHeadsUpLog.java index 61daf9c8d71c..fcc184a317b8 100644 --- a/packages/SystemUI/src/com/android/systemui/log/dagger/NotificationHeadsUpLog.java +++ b/packages/SystemUI/src/com/android/systemui/log/dagger/NotificationHeadsUpLog.java @@ -18,7 +18,7 @@ package com.android.systemui.log.dagger; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import com.android.systemui.plugins.log.LogBuffer; +import com.android.systemui.log.LogBuffer; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/packages/SystemUI/src/com/android/systemui/log/dagger/NotificationInterruptLog.java b/packages/SystemUI/src/com/android/systemui/log/dagger/NotificationInterruptLog.java index a59afa0fed1b..760fbf3928b6 100644 --- a/packages/SystemUI/src/com/android/systemui/log/dagger/NotificationInterruptLog.java +++ b/packages/SystemUI/src/com/android/systemui/log/dagger/NotificationInterruptLog.java @@ -18,7 +18,7 @@ package com.android.systemui.log.dagger; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import com.android.systemui.plugins.log.LogBuffer; +import com.android.systemui.log.LogBuffer; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/packages/SystemUI/src/com/android/systemui/log/dagger/NotificationLockscreenLog.java b/packages/SystemUI/src/com/android/systemui/log/dagger/NotificationLockscreenLog.java index a2d381ec90f0..f1646a837132 100644 --- a/packages/SystemUI/src/com/android/systemui/log/dagger/NotificationLockscreenLog.java +++ b/packages/SystemUI/src/com/android/systemui/log/dagger/NotificationLockscreenLog.java @@ -18,7 +18,7 @@ package com.android.systemui.log.dagger; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import com.android.systemui.plugins.log.LogBuffer; +import com.android.systemui.log.LogBuffer; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/packages/SystemUI/src/com/android/systemui/log/dagger/NotificationLog.java b/packages/SystemUI/src/com/android/systemui/log/dagger/NotificationLog.java index 6f8ea7ff2e9b..a0b686487bec 100644 --- a/packages/SystemUI/src/com/android/systemui/log/dagger/NotificationLog.java +++ b/packages/SystemUI/src/com/android/systemui/log/dagger/NotificationLog.java @@ -18,7 +18,7 @@ package com.android.systemui.log.dagger; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import com.android.systemui.plugins.log.LogBuffer; +import com.android.systemui.log.LogBuffer; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/packages/SystemUI/src/com/android/systemui/log/dagger/NotificationRenderLog.java b/packages/SystemUI/src/com/android/systemui/log/dagger/NotificationRenderLog.java index 835d3490293c..8c8753a07339 100644 --- a/packages/SystemUI/src/com/android/systemui/log/dagger/NotificationRenderLog.java +++ b/packages/SystemUI/src/com/android/systemui/log/dagger/NotificationRenderLog.java @@ -18,7 +18,7 @@ package com.android.systemui.log.dagger; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import com.android.systemui.plugins.log.LogBuffer; +import com.android.systemui.log.LogBuffer; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/packages/SystemUI/src/com/android/systemui/log/dagger/NotificationSectionLog.java b/packages/SystemUI/src/com/android/systemui/log/dagger/NotificationSectionLog.java index 6e2bd7b2e1b5..7259eebf19b6 100644 --- a/packages/SystemUI/src/com/android/systemui/log/dagger/NotificationSectionLog.java +++ b/packages/SystemUI/src/com/android/systemui/log/dagger/NotificationSectionLog.java @@ -18,7 +18,7 @@ package com.android.systemui.log.dagger; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import com.android.systemui.plugins.log.LogBuffer; +import com.android.systemui.log.LogBuffer; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/packages/SystemUI/src/com/android/systemui/log/dagger/PrivacyLog.java b/packages/SystemUI/src/com/android/systemui/log/dagger/PrivacyLog.java index 77b1bf5fd630..e96e532f94bf 100644 --- a/packages/SystemUI/src/com/android/systemui/log/dagger/PrivacyLog.java +++ b/packages/SystemUI/src/com/android/systemui/log/dagger/PrivacyLog.java @@ -18,7 +18,7 @@ package com.android.systemui.log.dagger; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import com.android.systemui.plugins.log.LogBuffer; +import com.android.systemui.log.LogBuffer; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/packages/SystemUI/src/com/android/systemui/log/dagger/QSConfigLog.java b/packages/SystemUI/src/com/android/systemui/log/dagger/QSConfigLog.java index 295bf88d498f..973f6501bbfd 100644 --- a/packages/SystemUI/src/com/android/systemui/log/dagger/QSConfigLog.java +++ b/packages/SystemUI/src/com/android/systemui/log/dagger/QSConfigLog.java @@ -18,7 +18,7 @@ package com.android.systemui.log.dagger; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import com.android.systemui.plugins.log.LogBuffer; +import com.android.systemui.log.LogBuffer; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/packages/SystemUI/src/com/android/systemui/log/dagger/QSFragmentDisableLog.java b/packages/SystemUI/src/com/android/systemui/log/dagger/QSFragmentDisableLog.java index 9fd166b759d2..557a254e5c09 100644 --- a/packages/SystemUI/src/com/android/systemui/log/dagger/QSFragmentDisableLog.java +++ b/packages/SystemUI/src/com/android/systemui/log/dagger/QSFragmentDisableLog.java @@ -18,7 +18,7 @@ package com.android.systemui.log.dagger; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import com.android.systemui.plugins.log.LogBuffer; +import com.android.systemui.log.LogBuffer; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/packages/SystemUI/src/com/android/systemui/log/dagger/QSLog.java b/packages/SystemUI/src/com/android/systemui/log/dagger/QSLog.java index dd168bac5654..dd5010cf39a8 100644 --- a/packages/SystemUI/src/com/android/systemui/log/dagger/QSLog.java +++ b/packages/SystemUI/src/com/android/systemui/log/dagger/QSLog.java @@ -18,7 +18,7 @@ package com.android.systemui.log.dagger; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import com.android.systemui.plugins.log.LogBuffer; +import com.android.systemui.log.LogBuffer; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/packages/SystemUI/src/com/android/systemui/log/dagger/ShadeLog.java b/packages/SystemUI/src/com/android/systemui/log/dagger/ShadeLog.java index d24bfcb88188..bd0d298ebdee 100644 --- a/packages/SystemUI/src/com/android/systemui/log/dagger/ShadeLog.java +++ b/packages/SystemUI/src/com/android/systemui/log/dagger/ShadeLog.java @@ -18,7 +18,7 @@ package com.android.systemui.log.dagger; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import com.android.systemui.plugins.log.LogBuffer; +import com.android.systemui.log.LogBuffer; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/packages/SystemUI/src/com/android/systemui/log/dagger/ShadeWindowLog.java b/packages/SystemUI/src/com/android/systemui/log/dagger/ShadeWindowLog.java index 1d2b68c3bf46..4aa2b1d84b21 100644 --- a/packages/SystemUI/src/com/android/systemui/log/dagger/ShadeWindowLog.java +++ b/packages/SystemUI/src/com/android/systemui/log/dagger/ShadeWindowLog.java @@ -18,7 +18,7 @@ package com.android.systemui.log.dagger; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import com.android.systemui.plugins.log.LogBuffer; +import com.android.systemui.log.LogBuffer; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/packages/SystemUI/src/com/android/systemui/log/dagger/StatusBarNetworkControllerLog.java b/packages/SystemUI/src/com/android/systemui/log/dagger/StatusBarNetworkControllerLog.java index af0f7c518e64..f26b3164f488 100644 --- a/packages/SystemUI/src/com/android/systemui/log/dagger/StatusBarNetworkControllerLog.java +++ b/packages/SystemUI/src/com/android/systemui/log/dagger/StatusBarNetworkControllerLog.java @@ -18,7 +18,7 @@ package com.android.systemui.log.dagger; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import com.android.systemui.plugins.log.LogBuffer; +import com.android.systemui.log.LogBuffer; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/packages/SystemUI/src/com/android/systemui/log/dagger/SwipeUpLog.java b/packages/SystemUI/src/com/android/systemui/log/dagger/SwipeUpLog.java index d58b538f2047..4d797c1a88cd 100644 --- a/packages/SystemUI/src/com/android/systemui/log/dagger/SwipeUpLog.java +++ b/packages/SystemUI/src/com/android/systemui/log/dagger/SwipeUpLog.java @@ -18,7 +18,7 @@ package com.android.systemui.log.dagger; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import com.android.systemui.plugins.log.LogBuffer; +import com.android.systemui.log.LogBuffer; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/packages/SystemUI/src/com/android/systemui/log/dagger/ToastLog.java b/packages/SystemUI/src/com/android/systemui/log/dagger/ToastLog.java index ba8b27c23ec1..8671dbfdf1fe 100644 --- a/packages/SystemUI/src/com/android/systemui/log/dagger/ToastLog.java +++ b/packages/SystemUI/src/com/android/systemui/log/dagger/ToastLog.java @@ -18,7 +18,7 @@ package com.android.systemui.log.dagger; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import com.android.systemui.plugins.log.LogBuffer; +import com.android.systemui.log.LogBuffer; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/packages/SystemUI/src/com/android/systemui/log/dagger/UnseenNotificationLog.java b/packages/SystemUI/src/com/android/systemui/log/dagger/UnseenNotificationLog.java index 5c2321be4388..dbb6e8cbcc07 100644 --- a/packages/SystemUI/src/com/android/systemui/log/dagger/UnseenNotificationLog.java +++ b/packages/SystemUI/src/com/android/systemui/log/dagger/UnseenNotificationLog.java @@ -18,7 +18,7 @@ package com.android.systemui.log.dagger; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import com.android.systemui.plugins.log.LogBuffer; +import com.android.systemui.log.LogBuffer; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/packages/SystemUI/src/com/android/systemui/log/table/TableLogBuffer.kt b/packages/SystemUI/src/com/android/systemui/log/table/TableLogBuffer.kt index 8babfc90d269..1d785ae62d87 100644 --- a/packages/SystemUI/src/com/android/systemui/log/table/TableLogBuffer.kt +++ b/packages/SystemUI/src/com/android/systemui/log/table/TableLogBuffer.kt @@ -20,8 +20,8 @@ import android.os.Trace import com.android.systemui.Dumpable import com.android.systemui.common.buffer.RingBuffer import com.android.systemui.dagger.qualifiers.Background -import com.android.systemui.plugins.log.LogLevel -import com.android.systemui.plugins.log.LogcatEchoTracker +import com.android.systemui.log.LogLevel +import com.android.systemui.log.LogcatEchoTracker import com.android.systemui.util.time.SystemClock import java.io.PrintWriter import java.text.SimpleDateFormat @@ -35,7 +35,7 @@ import kotlinx.coroutines.launch * A logger that logs changes in table format. * * Some parts of System UI maintain a lot of pieces of state at once. - * [com.android.systemui.plugins.log.LogBuffer] allows us to easily log change events: + * [com.android.systemui.log.LogBuffer] allows us to easily log change events: * - 10-10 10:10:10.456: state2 updated to newVal2 * - 10-10 10:11:00.000: stateN updated to StateN(val1=true, val2=1) * - 10-10 10:11:02.123: stateN updated to StateN(val1=true, val2=2) diff --git a/packages/SystemUI/src/com/android/systemui/log/table/TableLogBufferFactory.kt b/packages/SystemUI/src/com/android/systemui/log/table/TableLogBufferFactory.kt index 42e742db2842..19e112487c46 100644 --- a/packages/SystemUI/src/com/android/systemui/log/table/TableLogBufferFactory.kt +++ b/packages/SystemUI/src/com/android/systemui/log/table/TableLogBufferFactory.kt @@ -21,7 +21,7 @@ import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.dagger.qualifiers.Background import com.android.systemui.dump.DumpManager import com.android.systemui.log.LogBufferHelper.Companion.adjustMaxSize -import com.android.systemui.plugins.log.LogcatEchoTracker +import com.android.systemui.log.LogcatEchoTracker import com.android.systemui.util.time.SystemClock import javax.inject.Inject import kotlinx.coroutines.CoroutineDispatcher diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/pipeline/MediaTimeoutLogger.kt b/packages/SystemUI/src/com/android/systemui/media/controls/pipeline/MediaTimeoutLogger.kt index f731dc064355..e2e269de71a0 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/pipeline/MediaTimeoutLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/media/controls/pipeline/MediaTimeoutLogger.kt @@ -18,9 +18,9 @@ package com.android.systemui.media.controls.pipeline import android.media.session.PlaybackState import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel import com.android.systemui.log.dagger.MediaTimeoutListenerLog -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel import javax.inject.Inject private const val TAG = "MediaTimeout" diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/resume/ResumeMediaBrowserLogger.kt b/packages/SystemUI/src/com/android/systemui/media/controls/resume/ResumeMediaBrowserLogger.kt index 095cf09a6c2c..9e53d77dec99 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/resume/ResumeMediaBrowserLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/media/controls/resume/ResumeMediaBrowserLogger.kt @@ -18,9 +18,9 @@ package com.android.systemui.media.controls.resume import android.content.ComponentName import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel import com.android.systemui.log.dagger.MediaBrowserLog -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel import javax.inject.Inject /** A logger for events in [ResumeMediaBrowser]. */ diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaCarouselControllerLogger.kt b/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaCarouselControllerLogger.kt index 9af11b924ec8..0ed24349bdf4 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaCarouselControllerLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaCarouselControllerLogger.kt @@ -17,9 +17,9 @@ package com.android.systemui.media.controls.ui import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel import com.android.systemui.log.dagger.MediaCarouselControllerLog -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel import javax.inject.Inject /** A debug logger for [MediaCarouselController]. */ diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaViewLogger.kt b/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaViewLogger.kt index fdac33ac20b0..c781b7699b26 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaViewLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaViewLogger.kt @@ -17,9 +17,9 @@ package com.android.systemui.media.controls.ui import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel import com.android.systemui.log.dagger.MediaViewLog -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel import javax.inject.Inject private const val TAG = "MediaView" diff --git a/packages/SystemUI/src/com/android/systemui/media/dagger/MediaModule.java b/packages/SystemUI/src/com/android/systemui/media/dagger/MediaModule.java index 9ae4577b0394..46efac56ab9d 100644 --- a/packages/SystemUI/src/com/android/systemui/media/dagger/MediaModule.java +++ b/packages/SystemUI/src/com/android/systemui/media/dagger/MediaModule.java @@ -17,6 +17,7 @@ package com.android.systemui.media.dagger; import com.android.systemui.dagger.SysUISingleton; +import com.android.systemui.log.LogBuffer; import com.android.systemui.log.LogBufferFactory; import com.android.systemui.media.controls.pipeline.MediaDataManager; import com.android.systemui.media.controls.ui.MediaHierarchyManager; @@ -30,16 +31,15 @@ import com.android.systemui.media.taptotransfer.MediaTttCommandLineHelper; import com.android.systemui.media.taptotransfer.MediaTttFlags; import com.android.systemui.media.taptotransfer.receiver.MediaTttReceiverLogBuffer; import com.android.systemui.media.taptotransfer.sender.MediaTttSenderLogBuffer; -import com.android.systemui.plugins.log.LogBuffer; - -import java.util.Optional; - -import javax.inject.Named; import dagger.Lazy; import dagger.Module; import dagger.Provides; +import java.util.Optional; + +import javax.inject.Named; + /** Dagger module for the media package. */ @Module(subcomponents = { MediaComplicationComponent.class, diff --git a/packages/SystemUI/src/com/android/systemui/media/muteawait/MediaMuteAwaitLogger.kt b/packages/SystemUI/src/com/android/systemui/media/muteawait/MediaMuteAwaitLogger.kt index 5ace3ea8a05b..bbcf259418c8 100644 --- a/packages/SystemUI/src/com/android/systemui/media/muteawait/MediaMuteAwaitLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/media/muteawait/MediaMuteAwaitLogger.kt @@ -2,8 +2,8 @@ package com.android.systemui.media.muteawait import com.android.systemui.dagger.SysUISingleton import com.android.systemui.log.dagger.MediaMuteAwaitLog -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel import javax.inject.Inject /** Log messages for [MediaMuteAwaitConnectionManager]. */ diff --git a/packages/SystemUI/src/com/android/systemui/media/nearby/NearbyMediaDevicesLogger.kt b/packages/SystemUI/src/com/android/systemui/media/nearby/NearbyMediaDevicesLogger.kt index 78408fce5a36..66399d580582 100644 --- a/packages/SystemUI/src/com/android/systemui/media/nearby/NearbyMediaDevicesLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/media/nearby/NearbyMediaDevicesLogger.kt @@ -2,8 +2,8 @@ package com.android.systemui.media.nearby import com.android.systemui.dagger.SysUISingleton import com.android.systemui.log.dagger.NearbyMediaDevicesLog -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel import javax.inject.Inject /** Log messages for [NearbyMediaDevicesManager]. */ diff --git a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/common/MediaTttLoggerUtils.kt b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/common/MediaTttLoggerUtils.kt index 0e839c6dbc7a..eeda102702d2 100644 --- a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/common/MediaTttLoggerUtils.kt +++ b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/common/MediaTttLoggerUtils.kt @@ -16,8 +16,8 @@ package com.android.systemui.media.taptotransfer.common -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel /** A helper for logging media tap-to-transfer events. */ object MediaTttLoggerUtils { diff --git a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/receiver/MediaTttReceiverLogBuffer.java b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/receiver/MediaTttReceiverLogBuffer.java index 67e464c344c5..31ccb9afac9f 100644 --- a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/receiver/MediaTttReceiverLogBuffer.java +++ b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/receiver/MediaTttReceiverLogBuffer.java @@ -18,7 +18,7 @@ package com.android.systemui.media.taptotransfer.receiver; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import com.android.systemui.plugins.log.LogBuffer; +import com.android.systemui.log.LogBuffer; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/receiver/MediaTttReceiverLogger.kt b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/receiver/MediaTttReceiverLogger.kt index b0c6257df96c..1502df725a9c 100644 --- a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/receiver/MediaTttReceiverLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/receiver/MediaTttReceiverLogger.kt @@ -18,8 +18,8 @@ package com.android.systemui.media.taptotransfer.receiver import android.app.StatusBarManager import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.log.LogBuffer import com.android.systemui.media.taptotransfer.common.MediaTttLoggerUtils -import com.android.systemui.plugins.log.LogBuffer import com.android.systemui.temporarydisplay.TemporaryViewLogger import javax.inject.Inject diff --git a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/MediaTttSenderLogBuffer.java b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/MediaTttSenderLogBuffer.java index a262e97864f3..edee4a808968 100644 --- a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/MediaTttSenderLogBuffer.java +++ b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/MediaTttSenderLogBuffer.java @@ -18,7 +18,7 @@ package com.android.systemui.media.taptotransfer.sender; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import com.android.systemui.plugins.log.LogBuffer; +import com.android.systemui.log.LogBuffer; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/MediaTttSenderLogger.kt b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/MediaTttSenderLogger.kt index 964a95b9be9a..03bcfc8113e3 100644 --- a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/MediaTttSenderLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/MediaTttSenderLogger.kt @@ -18,9 +18,9 @@ package com.android.systemui.media.taptotransfer.sender import android.app.StatusBarManager import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel import com.android.systemui.media.taptotransfer.common.MediaTttLoggerUtils -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel import javax.inject.Inject /** A logger for all events related to the media tap-to-transfer sender experience. */ diff --git a/packages/SystemUI/src/com/android/systemui/privacy/logging/PrivacyLogger.kt b/packages/SystemUI/src/com/android/systemui/privacy/logging/PrivacyLogger.kt index 03503fd1ff61..f9e1adff012b 100644 --- a/packages/SystemUI/src/com/android/systemui/privacy/logging/PrivacyLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/privacy/logging/PrivacyLogger.kt @@ -18,9 +18,9 @@ package com.android.systemui.privacy.logging import android.permission.PermissionGroupUsage import com.android.systemui.log.dagger.PrivacyLog -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel -import com.android.systemui.plugins.log.LogMessage +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel +import com.android.systemui.log.LogMessage import com.android.systemui.privacy.PrivacyDialog import com.android.systemui.privacy.PrivacyItem import java.text.SimpleDateFormat diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSFragmentDisableFlagsLogger.kt b/packages/SystemUI/src/com/android/systemui/qs/QSFragmentDisableFlagsLogger.kt index 025fb228b829..cd52ec29177d 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSFragmentDisableFlagsLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/QSFragmentDisableFlagsLogger.kt @@ -1,8 +1,8 @@ package com.android.systemui.qs import com.android.systemui.log.dagger.QSFragmentDisableLog -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel import com.android.systemui.statusbar.disableflags.DisableFlagsLogger import javax.inject.Inject diff --git a/packages/SystemUI/src/com/android/systemui/qs/logging/QSLogger.kt b/packages/SystemUI/src/com/android/systemui/qs/logging/QSLogger.kt index 5b461a6d8bad..c00a81cbf12b 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/logging/QSLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/logging/QSLogger.kt @@ -21,14 +21,14 @@ import android.content.res.Configuration.ORIENTATION_PORTRAIT import android.content.res.Configuration.Orientation import android.service.quicksettings.Tile import android.view.View +import com.android.systemui.log.ConstantStringsLogger +import com.android.systemui.log.ConstantStringsLoggerImpl +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel.DEBUG +import com.android.systemui.log.LogLevel.ERROR +import com.android.systemui.log.LogLevel.VERBOSE import com.android.systemui.log.dagger.QSConfigLog import com.android.systemui.log.dagger.QSLog -import com.android.systemui.plugins.log.ConstantStringsLogger -import com.android.systemui.plugins.log.ConstantStringsLoggerImpl -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel.DEBUG -import com.android.systemui.plugins.log.LogLevel.ERROR -import com.android.systemui.plugins.log.LogLevel.VERBOSE import com.android.systemui.plugins.qs.QSTile import com.android.systemui.statusbar.StatusBarState import com.google.errorprone.annotations.CompileTimeConstant diff --git a/packages/SystemUI/src/com/android/systemui/qs/pipeline/dagger/QSPipelineModule.kt b/packages/SystemUI/src/com/android/systemui/qs/pipeline/dagger/QSPipelineModule.kt index e85440cad6b0..a066242fd96b 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/pipeline/dagger/QSPipelineModule.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/pipeline/dagger/QSPipelineModule.kt @@ -18,8 +18,8 @@ package com.android.systemui.qs.pipeline.dagger import com.android.systemui.CoreStartable import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.log.LogBuffer import com.android.systemui.log.LogBufferFactory -import com.android.systemui.plugins.log.LogBuffer import com.android.systemui.qs.pipeline.data.repository.TileSpecRepository import com.android.systemui.qs.pipeline.data.repository.TileSpecSettingsRepository import com.android.systemui.qs.pipeline.domain.interactor.CurrentTilesInteractor diff --git a/packages/SystemUI/src/com/android/systemui/qs/pipeline/shared/logging/QSPipelineLogger.kt b/packages/SystemUI/src/com/android/systemui/qs/pipeline/shared/logging/QSPipelineLogger.kt index 767ce919d027..b564334b5c52 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/pipeline/shared/logging/QSPipelineLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/pipeline/shared/logging/QSPipelineLogger.kt @@ -17,8 +17,8 @@ package com.android.systemui.qs.pipeline.shared.logging import android.annotation.UserIdInt -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel import com.android.systemui.qs.pipeline.dagger.QSTileListLog import com.android.systemui.qs.pipeline.shared.TileSpec import javax.inject.Inject diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeLogger.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadeLogger.kt index 1839e13dcdec..25073c1b64db 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/ShadeLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeLogger.kt @@ -18,8 +18,8 @@ package com.android.systemui.shade import android.view.MotionEvent import com.android.systemui.log.dagger.ShadeLog -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel import com.android.systemui.shade.ShadeViewController.Companion.FLING_COLLAPSE import com.android.systemui.shade.ShadeViewController.Companion.FLING_EXPAND import com.android.systemui.shade.ShadeViewController.Companion.FLING_HIDE diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeWindowLogger.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadeWindowLogger.kt index 9851625b6152..d8d42795be58 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/ShadeWindowLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeWindowLogger.kt @@ -18,12 +18,12 @@ package com.android.systemui.shade import android.view.WindowManager import com.android.systemui.log.dagger.ShadeWindowLog -import com.android.systemui.plugins.log.ConstantStringsLogger -import com.android.systemui.plugins.log.ConstantStringsLoggerImpl -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel -import com.android.systemui.plugins.log.LogLevel.DEBUG -import com.android.systemui.plugins.log.LogMessage +import com.android.systemui.log.ConstantStringsLogger +import com.android.systemui.log.ConstantStringsLoggerImpl +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel +import com.android.systemui.log.LogLevel.DEBUG +import com.android.systemui.log.LogMessage import javax.inject.Inject private const val TAG = "systemui.shadewindow" diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ActionClickLogger.kt b/packages/SystemUI/src/com/android/systemui/statusbar/ActionClickLogger.kt index 90c52bd8c9f4..e008ec0dc75c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/ActionClickLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/ActionClickLogger.kt @@ -18,8 +18,8 @@ package com.android.systemui.statusbar import android.app.PendingIntent import com.android.systemui.log.dagger.NotifInteractionLog -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel import com.android.systemui.statusbar.notification.collection.NotificationEntry import javax.inject.Inject diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java index ea5a1c0fbe70..0ea257010751 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java @@ -41,8 +41,8 @@ import static com.android.systemui.keyguard.KeyguardIndicationRotateTextViewCont import static com.android.systemui.keyguard.KeyguardIndicationRotateTextViewController.INDICATION_TYPE_TRUST; import static com.android.systemui.keyguard.KeyguardIndicationRotateTextViewController.INDICATION_TYPE_USER_LOCKED; import static com.android.systemui.keyguard.ScreenLifecycle.SCREEN_ON; +import static com.android.systemui.log.LogLevel.ERROR; import static com.android.systemui.plugins.FalsingManager.LOW_PENALTY; -import static com.android.systemui.plugins.log.LogLevel.ERROR; import android.app.AlarmManager; import android.app.admin.DevicePolicyManager; @@ -95,8 +95,8 @@ import com.android.systemui.keyguard.KeyguardIndication; import com.android.systemui.keyguard.KeyguardIndicationRotateTextViewController; import com.android.systemui.keyguard.ScreenLifecycle; import com.android.systemui.keyguard.domain.interactor.AlternateBouncerInteractor; +import com.android.systemui.log.LogLevel; import com.android.systemui.plugins.FalsingManager; -import com.android.systemui.plugins.log.LogLevel; import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.settings.UserTracker; import com.android.systemui.statusbar.phone.KeyguardBypassController; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/NetworkControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/NetworkControllerImpl.java index 6e74542691a5..2465c21c956f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/NetworkControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/NetworkControllerImpl.java @@ -73,9 +73,9 @@ import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.demomode.DemoMode; import com.android.systemui.demomode.DemoModeController; import com.android.systemui.dump.DumpManager; +import com.android.systemui.log.LogBuffer; +import com.android.systemui.log.LogLevel; import com.android.systemui.log.dagger.StatusBarNetworkControllerLog; -import com.android.systemui.plugins.log.LogBuffer; -import com.android.systemui.plugins.log.LogLevel; import com.android.systemui.qs.tiles.dialog.InternetDialogFactory; import com.android.systemui.settings.UserTracker; import com.android.systemui.statusbar.pipeline.StatusBarPipelineFlags; @@ -87,6 +87,8 @@ import com.android.systemui.statusbar.policy.DeviceProvisionedController.DeviceP import com.android.systemui.telephony.TelephonyListenerManager; import com.android.systemui.util.CarrierConfigTracker; +import kotlin.Unit; + import java.io.PrintWriter; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -101,8 +103,6 @@ import java.util.stream.Collectors; import javax.inject.Inject; -import kotlin.Unit; - /** Platform implementation of the network controller. **/ @SysUISingleton public class NetworkControllerImpl extends BroadcastReceiver diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/gesture/SwipeUpGestureLogger.kt b/packages/SystemUI/src/com/android/systemui/statusbar/gesture/SwipeUpGestureLogger.kt index 9ce6b02e55d9..a67c26c06cb9 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/gesture/SwipeUpGestureLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/gesture/SwipeUpGestureLogger.kt @@ -18,8 +18,8 @@ package com.android.systemui.statusbar.gesture import com.android.systemui.dagger.SysUISingleton import com.android.systemui.log.dagger.SwipeUpLog -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel import javax.inject.Inject /** Log messages for [SwipeUpGestureHandler]. */ diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationClickerLogger.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationClickerLogger.kt index 3058fbbc1031..a3a72d92c2e4 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationClickerLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationClickerLogger.kt @@ -17,8 +17,8 @@ package com.android.systemui.statusbar.notification import com.android.systemui.log.dagger.NotifInteractionLog -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel import com.android.systemui.statusbar.notification.collection.NotificationEntry import javax.inject.Inject diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationWakeUpCoordinatorLogger.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationWakeUpCoordinatorLogger.kt index dd3c2a9df3e5..f7679ed058c6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationWakeUpCoordinatorLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationWakeUpCoordinatorLogger.kt @@ -13,9 +13,9 @@ package com.android.systemui.statusbar.notification +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel.DEBUG import com.android.systemui.log.dagger.NotificationLockscreenLog -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel.DEBUG import com.android.systemui.statusbar.StatusBarState import javax.inject.Inject diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/RemoteInputControllerLogger.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/RemoteInputControllerLogger.kt index 9582dfad35cd..487a5f87d0bd 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/RemoteInputControllerLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/RemoteInputControllerLogger.kt @@ -17,9 +17,9 @@ package com.android.systemui.statusbar.notification import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel.DEBUG import com.android.systemui.log.dagger.NotificationRemoteInputLog -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel.DEBUG import javax.inject.Inject /** Logger class for [RemoteInputController]. */ diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coalescer/GroupCoalescerLogger.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coalescer/GroupCoalescerLogger.kt index 68d1319699d4..39d0833c57d4 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coalescer/GroupCoalescerLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coalescer/GroupCoalescerLogger.kt @@ -17,8 +17,8 @@ package com.android.systemui.statusbar.notification.collection.coalescer import com.android.systemui.log.dagger.NotificationLog -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel import javax.inject.Inject class GroupCoalescerLogger @Inject constructor( diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/GutsCoordinatorLogger.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/GutsCoordinatorLogger.kt index 2919def16304..79c63e6b0db1 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/GutsCoordinatorLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/GutsCoordinatorLogger.kt @@ -1,8 +1,8 @@ package com.android.systemui.statusbar.notification.collection.coordinator import com.android.systemui.log.dagger.NotificationLog -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel import com.android.systemui.statusbar.notification.row.NotificationGuts import javax.inject.Inject diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/HeadsUpCoordinatorLogger.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/HeadsUpCoordinatorLogger.kt index 32c3c6665b6f..e17ce5cff37d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/HeadsUpCoordinatorLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/HeadsUpCoordinatorLogger.kt @@ -3,8 +3,8 @@ package com.android.systemui.statusbar.notification.collection.coordinator import android.util.Log import com.android.systemui.log.dagger.NotificationHeadsUpLog -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel import javax.inject.Inject private const val TAG = "HeadsUpCoordinator" diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinatorLogger.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinatorLogger.kt index 6503a6403eaa..1f8ec3411bcd 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinatorLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinatorLogger.kt @@ -16,9 +16,9 @@ package com.android.systemui.statusbar.notification.collection.coordinator +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel import com.android.systemui.log.dagger.UnseenNotificationLog -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel import javax.inject.Inject private const val TAG = "KeyguardCoordinator" diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/PreparationCoordinatorLogger.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/PreparationCoordinatorLogger.kt index 9558f47af795..6271d38f1efa 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/PreparationCoordinatorLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/PreparationCoordinatorLogger.kt @@ -17,8 +17,8 @@ package com.android.systemui.statusbar.notification.collection.coordinator import com.android.systemui.log.dagger.NotificationLog -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel import com.android.systemui.statusbar.notification.collection.GroupEntry import com.android.systemui.statusbar.notification.collection.NotificationEntry import com.android.systemui.statusbar.notification.logKey diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/ShadeEventCoordinatorLogger.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/ShadeEventCoordinatorLogger.kt index d80445491bda..1f4861a10e75 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/ShadeEventCoordinatorLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/ShadeEventCoordinatorLogger.kt @@ -17,8 +17,8 @@ package com.android.systemui.statusbar.notification.collection.coordinator import com.android.systemui.log.dagger.NotificationLog -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel import javax.inject.Inject private const val TAG = "ShadeEventCoordinator" diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/listbuilder/ShadeListBuilderLogger.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/listbuilder/ShadeListBuilderLogger.kt index 4adc90aec0fb..f13ff6814df8 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/listbuilder/ShadeListBuilderLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/listbuilder/ShadeListBuilderLogger.kt @@ -17,10 +17,10 @@ package com.android.systemui.statusbar.notification.collection.listbuilder import com.android.systemui.log.dagger.NotificationLog -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel.DEBUG -import com.android.systemui.plugins.log.LogLevel.INFO -import com.android.systemui.plugins.log.LogLevel.WARNING +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel.DEBUG +import com.android.systemui.log.LogLevel.INFO +import com.android.systemui.log.LogLevel.WARNING import com.android.systemui.statusbar.notification.NotifPipelineFlags import com.android.systemui.statusbar.notification.collection.GroupEntry import com.android.systemui.statusbar.notification.collection.ListEntry diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/notifcollection/NotifCollectionLogger.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/notifcollection/NotifCollectionLogger.kt index 911a2d0c2b36..20de785bc9bd 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/notifcollection/NotifCollectionLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/notifcollection/NotifCollectionLogger.kt @@ -21,12 +21,12 @@ import android.service.notification.NotificationListenerService import android.service.notification.NotificationListenerService.RankingMap import android.service.notification.StatusBarNotification import com.android.systemui.log.dagger.NotificationLog -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel.DEBUG -import com.android.systemui.plugins.log.LogLevel.ERROR -import com.android.systemui.plugins.log.LogLevel.INFO -import com.android.systemui.plugins.log.LogLevel.WARNING -import com.android.systemui.plugins.log.LogLevel.WTF +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel.DEBUG +import com.android.systemui.log.LogLevel.ERROR +import com.android.systemui.log.LogLevel.INFO +import com.android.systemui.log.LogLevel.WARNING +import com.android.systemui.log.LogLevel.WTF import com.android.systemui.statusbar.notification.collection.NotifCollection import com.android.systemui.statusbar.notification.collection.NotifCollection.CancellationReason import com.android.systemui.statusbar.notification.collection.NotifCollection.FutureDismissal diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/NodeSpecBuilderLogger.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/NodeSpecBuilderLogger.kt index 9c71e5c1054c..07fd349d3786 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/NodeSpecBuilderLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/NodeSpecBuilderLogger.kt @@ -17,8 +17,8 @@ package com.android.systemui.statusbar.notification.collection.render import com.android.systemui.log.dagger.NotificationLog -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel import com.android.systemui.statusbar.notification.NotifPipelineFlags import com.android.systemui.statusbar.notification.collection.listbuilder.NotifSection import com.android.systemui.util.Compile diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/ShadeViewDifferLogger.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/ShadeViewDifferLogger.kt index 1e22c2cd7c0e..a880b7157708 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/ShadeViewDifferLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/ShadeViewDifferLogger.kt @@ -17,8 +17,8 @@ package com.android.systemui.statusbar.notification.collection.render import com.android.systemui.log.dagger.NotificationLog -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel import java.lang.RuntimeException import javax.inject.Inject diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/HeadsUpViewBinderLogger.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/HeadsUpViewBinderLogger.kt index d4f11fc141f0..0b31265963ed 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/HeadsUpViewBinderLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/HeadsUpViewBinderLogger.kt @@ -1,8 +1,8 @@ package com.android.systemui.statusbar.notification.interruption import com.android.systemui.log.dagger.NotificationHeadsUpLog -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel.INFO +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel.INFO import com.android.systemui.statusbar.notification.collection.NotificationEntry import com.android.systemui.statusbar.notification.logKey import javax.inject.Inject diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptLogger.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptLogger.kt index 115e050258c3..5bac2a9350a5 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptLogger.kt @@ -19,10 +19,10 @@ package com.android.systemui.statusbar.notification.interruption import android.util.Log import com.android.systemui.log.dagger.NotificationInterruptLog -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel.DEBUG -import com.android.systemui.plugins.log.LogLevel.INFO -import com.android.systemui.plugins.log.LogLevel.WARNING +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel.DEBUG +import com.android.systemui.log.LogLevel.INFO +import com.android.systemui.log.LogLevel.WARNING import com.android.systemui.statusbar.notification.collection.NotificationEntry import com.android.systemui.statusbar.notification.logKey import com.android.systemui.util.Compile diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/logging/NotificationRoundnessLogger.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/logging/NotificationRoundnessLogger.kt index 10197a38527e..fe03b2ad6a32 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/logging/NotificationRoundnessLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/logging/NotificationRoundnessLogger.kt @@ -16,9 +16,9 @@ package com.android.systemui.statusbar.notification.logging +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel.INFO import com.android.systemui.log.dagger.NotificationRenderLog -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel.INFO import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow import com.android.systemui.statusbar.notification.row.ExpandableView import com.android.systemui.statusbar.notification.stack.NotificationSection diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotifBindPipelineLogger.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotifBindPipelineLogger.kt index 46fef3f973a7..45be0b151870 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotifBindPipelineLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotifBindPipelineLogger.kt @@ -17,8 +17,8 @@ package com.android.systemui.statusbar.notification.row import com.android.systemui.log.dagger.NotificationLog -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel.INFO +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel.INFO import com.android.systemui.statusbar.notification.collection.NotificationEntry import com.android.systemui.statusbar.notification.logKey import javax.inject.Inject diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationRowLogger.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationRowLogger.kt index ce11be36acf3..c3dd92a51a91 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationRowLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationRowLogger.kt @@ -17,9 +17,9 @@ package com.android.systemui.statusbar.notification.row +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel import com.android.systemui.log.dagger.NotificationLog -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel import com.android.systemui.statusbar.notification.collection.NotificationEntry import com.android.systemui.statusbar.notification.logKey import javax.inject.Inject diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/RowContentBindStageLogger.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/RowContentBindStageLogger.kt index 8a5d29a1ae2d..684a276ed635 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/RowContentBindStageLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/RowContentBindStageLogger.kt @@ -17,8 +17,8 @@ package com.android.systemui.statusbar.notification.row import com.android.systemui.log.dagger.NotificationLog -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel.INFO +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel.INFO import com.android.systemui.statusbar.notification.collection.NotificationEntry import com.android.systemui.statusbar.notification.logKey import javax.inject.Inject diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSectionsLogger.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSectionsLogger.kt index b61c55edadcd..f9531876e30d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSectionsLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSectionsLogger.kt @@ -18,8 +18,8 @@ package com.android.systemui.statusbar.notification.stack import com.android.systemui.dagger.SysUISingleton import com.android.systemui.log.dagger.NotificationSectionLog -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel import javax.inject.Inject private const val TAG = "NotifSections" diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLogger.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLogger.kt index 64dd6dcd3008..5b0ec1d14edc 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLogger.kt @@ -1,9 +1,9 @@ package com.android.systemui.statusbar.notification.stack import com.android.systemui.log.dagger.NotificationHeadsUpLog -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel.DEBUG -import com.android.systemui.plugins.log.LogLevel.INFO +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel.DEBUG +import com.android.systemui.log.LogLevel.INFO import com.android.systemui.statusbar.notification.collection.NotificationEntry import com.android.systemui.statusbar.notification.logKey import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout.AnimationEvent.ANIMATION_TYPE_ADD diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackStateLogger.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackStateLogger.kt index f5de678a8536..cca84b3330a9 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackStateLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackStateLogger.kt @@ -1,8 +1,8 @@ package com.android.systemui.statusbar.notification.stack import com.android.systemui.log.dagger.NotificationHeadsUpLog -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel import com.android.systemui.statusbar.notification.logKey import javax.inject.Inject diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarViewController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarViewController.java index e835c5cebbc3..12ed71bf14d1 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarViewController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarViewController.java @@ -45,7 +45,7 @@ import com.android.systemui.R; import com.android.systemui.animation.InterpolatorsAndroidX; import com.android.systemui.battery.BatteryMeterViewController; import com.android.systemui.dagger.qualifiers.Main; -import com.android.systemui.plugins.log.LogLevel; +import com.android.systemui.log.LogLevel; import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.shade.ShadeViewStateProvider; import com.android.systemui.statusbar.CommandQueue; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LSShadeTransitionLogger.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LSShadeTransitionLogger.kt index 4839fe6a7bef..5c357d7cd3ab 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LSShadeTransitionLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LSShadeTransitionLogger.kt @@ -20,8 +20,8 @@ import android.util.DisplayMetrics import android.view.View import com.android.internal.logging.nano.MetricsProto.MetricsEvent import com.android.systemui.log.dagger.LSShadeTransitionLog -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow import com.android.systemui.statusbar.notification.row.ExpandableView import javax.inject.Inject diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarterLogger.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarterLogger.kt index 1f0b96a58da6..12f023b21701 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarterLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarterLogger.kt @@ -18,11 +18,11 @@ package com.android.systemui.statusbar.phone import android.app.PendingIntent import com.android.systemui.log.dagger.NotifInteractionLog -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel.DEBUG -import com.android.systemui.plugins.log.LogLevel.ERROR -import com.android.systemui.plugins.log.LogLevel.INFO -import com.android.systemui.plugins.log.LogLevel.WARNING +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel.DEBUG +import com.android.systemui.log.LogLevel.ERROR +import com.android.systemui.log.LogLevel.INFO +import com.android.systemui.log.LogLevel.WARNING import com.android.systemui.statusbar.notification.collection.NotificationEntry import com.android.systemui.statusbar.notification.logKey import javax.inject.Inject diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragmentLogger.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragmentLogger.kt index d64bc58a0c37..0c86b51a4995 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragmentLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragmentLogger.kt @@ -17,8 +17,8 @@ package com.android.systemui.statusbar.phone.fragment import com.android.systemui.log.dagger.CollapsedSbFragmentLog -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel import com.android.systemui.statusbar.disableflags.DisableFlagsLogger import javax.inject.Inject diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/dagger/StatusBarPipelineModule.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/dagger/StatusBarPipelineModule.kt index b3d246164e87..19c77e0b0de3 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/dagger/StatusBarPipelineModule.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/dagger/StatusBarPipelineModule.kt @@ -22,7 +22,7 @@ import com.android.systemui.dagger.SysUISingleton import com.android.systemui.log.LogBufferFactory import com.android.systemui.log.table.TableLogBuffer import com.android.systemui.log.table.TableLogBufferFactory -import com.android.systemui.plugins.log.LogBuffer +import com.android.systemui.log.LogBuffer import com.android.systemui.statusbar.pipeline.airplane.data.repository.AirplaneModeRepository import com.android.systemui.statusbar.pipeline.airplane.data.repository.AirplaneModeRepositoryImpl import com.android.systemui.statusbar.pipeline.airplane.ui.viewmodel.AirplaneModeViewModel diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/MobileInputLogger.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/MobileInputLogger.kt index 68cbbceb056d..b3a1c4075d87 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/MobileInputLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/MobileInputLogger.kt @@ -22,8 +22,8 @@ import android.telephony.TelephonyDisplayInfo import com.android.settingslib.SignalIcon import com.android.settingslib.mobile.MobileMappings import com.android.systemui.dagger.SysUISingleton -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel import com.android.systemui.statusbar.pipeline.dagger.MobileInputLog import javax.inject.Inject diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/MobileViewLogger.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/MobileViewLogger.kt index f2f91430eba6..7e0c145696c9 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/MobileViewLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/MobileViewLogger.kt @@ -20,8 +20,8 @@ import android.view.View import com.android.systemui.Dumpable import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dump.DumpManager -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel import com.android.systemui.statusbar.pipeline.dagger.MobileViewLog import com.android.systemui.statusbar.pipeline.mobile.ui.viewmodel.LocationBasedMobileViewModel import java.io.PrintWriter diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/VerboseMobileViewLogger.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/VerboseMobileViewLogger.kt index f67bc8f14447..507549b1e234 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/VerboseMobileViewLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/VerboseMobileViewLogger.kt @@ -19,8 +19,8 @@ package com.android.systemui.statusbar.pipeline.mobile.ui import android.view.View import com.android.systemui.common.shared.model.Icon import com.android.systemui.dagger.SysUISingleton -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel import com.android.systemui.statusbar.pipeline.dagger.VerboseMobileViewLog import com.android.systemui.statusbar.pipeline.mobile.ui.MobileViewLogger.Companion.getIdForLogging import com.android.systemui.statusbar.pipeline.mobile.ui.model.SignalIconModel diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ConnectivityInputLogger.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ConnectivityInputLogger.kt index 82492babba46..051f43f1059c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ConnectivityInputLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ConnectivityInputLogger.kt @@ -19,8 +19,8 @@ package com.android.systemui.statusbar.pipeline.shared import android.net.Network import android.net.NetworkCapabilities import com.android.systemui.dagger.SysUISingleton -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel import com.android.systemui.statusbar.pipeline.dagger.SharedConnectivityInputLog import com.android.systemui.statusbar.pipeline.shared.data.model.DefaultConnectionModel import javax.inject.Inject diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/LoggerHelper.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/LoggerHelper.kt index a96e8ff20dd4..328d901b541d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/LoggerHelper.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/LoggerHelper.kt @@ -18,8 +18,8 @@ package com.android.systemui.statusbar.pipeline.shared import android.net.Network import android.net.NetworkCapabilities -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel /** Helper object for logs that are shared between wifi and mobile. */ object LoggerHelper { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/data/model/DefaultConnectionModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/data/model/DefaultConnectionModel.kt index 2a02687f0761..058eda4400df 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/data/model/DefaultConnectionModel.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/data/model/DefaultConnectionModel.kt @@ -17,7 +17,7 @@ package com.android.systemui.statusbar.pipeline.shared.data.model import android.net.NetworkCapabilities -import com.android.systemui.plugins.log.LogMessage +import com.android.systemui.log.LogMessage /** * A model for all of the current default connections(s). diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/shared/WifiInputLogger.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/shared/WifiInputLogger.kt index bb0b166f7aba..4a9ceacb0bd1 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/shared/WifiInputLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/shared/WifiInputLogger.kt @@ -19,8 +19,8 @@ package com.android.systemui.statusbar.pipeline.wifi.shared import android.net.Network import android.net.NetworkCapabilities import com.android.systemui.dagger.SysUISingleton -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel import com.android.systemui.statusbar.pipeline.dagger.WifiInputLog import com.android.systemui.statusbar.pipeline.shared.LoggerHelper import javax.inject.Inject diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/DeviceStateRotationLockSettingControllerLogger.kt b/packages/SystemUI/src/com/android/systemui/statusbar/policy/DeviceStateRotationLockSettingControllerLogger.kt index f61f3b7a70f0..6ba2a81b4b13 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/DeviceStateRotationLockSettingControllerLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/DeviceStateRotationLockSettingControllerLogger.kt @@ -21,9 +21,9 @@ import android.provider.Settings.Secure.DEVICE_STATE_ROTATION_LOCK_IGNORED import android.provider.Settings.Secure.DEVICE_STATE_ROTATION_LOCK_LOCKED import android.provider.Settings.Secure.DEVICE_STATE_ROTATION_LOCK_UNLOCKED import com.android.internal.R +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel.VERBOSE import com.android.systemui.log.dagger.DeviceStateAutoRotationLog -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel.VERBOSE import javax.inject.Inject class DeviceStateRotationLockSettingControllerLogger diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManagerLogger.kt b/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManagerLogger.kt index df1e80b78c9b..06ed1fd279b5 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManagerLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManagerLogger.kt @@ -17,9 +17,9 @@ package com.android.systemui.statusbar.policy import com.android.systemui.log.dagger.NotificationHeadsUpLog -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel.INFO -import com.android.systemui.plugins.log.LogLevel.VERBOSE +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel.INFO +import com.android.systemui.log.LogLevel.VERBOSE import com.android.systemui.statusbar.notification.collection.NotificationEntry import com.android.systemui.statusbar.notification.logKey import javax.inject.Inject diff --git a/packages/SystemUI/src/com/android/systemui/temporarydisplay/TemporaryViewLogger.kt b/packages/SystemUI/src/com/android/systemui/temporarydisplay/TemporaryViewLogger.kt index 667e22a82a2a..066ac04c2727 100644 --- a/packages/SystemUI/src/com/android/systemui/temporarydisplay/TemporaryViewLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/temporarydisplay/TemporaryViewLogger.kt @@ -17,8 +17,8 @@ package com.android.systemui.temporarydisplay import android.view.View -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel /** A logger for temporary view changes -- see [TemporaryViewDisplayController]. */ open class TemporaryViewLogger( diff --git a/packages/SystemUI/src/com/android/systemui/temporarydisplay/chipbar/ChipbarLogger.kt b/packages/SystemUI/src/com/android/systemui/temporarydisplay/chipbar/ChipbarLogger.kt index f23942847e68..d55751b9d8a0 100644 --- a/packages/SystemUI/src/com/android/systemui/temporarydisplay/chipbar/ChipbarLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/temporarydisplay/chipbar/ChipbarLogger.kt @@ -17,8 +17,8 @@ package com.android.systemui.temporarydisplay.chipbar import com.android.systemui.dagger.SysUISingleton -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel import com.android.systemui.temporarydisplay.TemporaryViewLogger import com.android.systemui.temporarydisplay.dagger.ChipbarLog import javax.inject.Inject diff --git a/packages/SystemUI/src/com/android/systemui/temporarydisplay/dagger/TemporaryDisplayModule.kt b/packages/SystemUI/src/com/android/systemui/temporarydisplay/dagger/TemporaryDisplayModule.kt index b1be4045eb43..cae13086f592 100644 --- a/packages/SystemUI/src/com/android/systemui/temporarydisplay/dagger/TemporaryDisplayModule.kt +++ b/packages/SystemUI/src/com/android/systemui/temporarydisplay/dagger/TemporaryDisplayModule.kt @@ -18,9 +18,9 @@ package com.android.systemui.temporarydisplay.dagger import android.content.Context import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.log.LogBuffer import com.android.systemui.log.LogBufferFactory import com.android.systemui.media.taptotransfer.MediaTttFlags -import com.android.systemui.plugins.log.LogBuffer import com.android.systemui.settings.DisplayTracker import com.android.systemui.statusbar.gesture.SwipeUpGestureLogger import com.android.systemui.temporarydisplay.chipbar.SwipeChipbarAwayGestureHandler diff --git a/packages/SystemUI/src/com/android/systemui/toast/ToastLogger.kt b/packages/SystemUI/src/com/android/systemui/toast/ToastLogger.kt index fda511433143..dfe748afbd41 100644 --- a/packages/SystemUI/src/com/android/systemui/toast/ToastLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/toast/ToastLogger.kt @@ -17,10 +17,10 @@ package com.android.systemui.toast import com.android.systemui.log.dagger.ToastLog -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel -import com.android.systemui.plugins.log.LogLevel.DEBUG -import com.android.systemui.plugins.log.LogMessage +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel +import com.android.systemui.log.LogLevel.DEBUG +import com.android.systemui.log.LogMessage import javax.inject.Inject private const val TAG = "ToastLog" diff --git a/packages/SystemUI/src/com/android/systemui/util/wakelock/WakeLockLog.java b/packages/SystemUI/src/com/android/systemui/util/wakelock/WakeLockLog.java index 59cb0525a7e9..9cebc330af12 100644 --- a/packages/SystemUI/src/com/android/systemui/util/wakelock/WakeLockLog.java +++ b/packages/SystemUI/src/com/android/systemui/util/wakelock/WakeLockLog.java @@ -18,7 +18,7 @@ package com.android.systemui.util.wakelock; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import com.android.systemui.plugins.log.LogBuffer; +import com.android.systemui.log.LogBuffer; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/packages/SystemUI/src/com/android/systemui/util/wakelock/WakeLockLogger.kt b/packages/SystemUI/src/com/android/systemui/util/wakelock/WakeLockLogger.kt index 951903dc29bd..09268007dddc 100644 --- a/packages/SystemUI/src/com/android/systemui/util/wakelock/WakeLockLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/util/wakelock/WakeLockLogger.kt @@ -17,8 +17,8 @@ package com.android.systemui.util.wakelock import android.os.PowerManager -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel import javax.inject.Inject class WakeLockLogger @Inject constructor(@WakeLockLog private val buffer: LogBuffer) { diff --git a/packages/SystemUI/tests/src/com/android/keyguard/ClockEventControllerTest.kt b/packages/SystemUI/tests/src/com/android/keyguard/ClockEventControllerTest.kt index 8f4b32006919..19d5278932c2 100644 --- a/packages/SystemUI/tests/src/com/android/keyguard/ClockEventControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/keyguard/ClockEventControllerTest.kt @@ -35,7 +35,7 @@ import com.android.systemui.plugins.ClockFaceController import com.android.systemui.plugins.ClockFaceConfig import com.android.systemui.plugins.ClockFaceEvents import com.android.systemui.plugins.ClockTickRate -import com.android.systemui.plugins.log.LogBuffer +import com.android.systemui.log.LogBuffer import com.android.systemui.statusbar.CommandQueue import com.android.systemui.statusbar.policy.BatteryController import com.android.systemui.statusbar.policy.ConfigurationController diff --git a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardClockSwitchControllerTest.java b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardClockSwitchControllerTest.java index 95db0c096faf..fb738454fc71 100644 --- a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardClockSwitchControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardClockSwitchControllerTest.java @@ -45,6 +45,7 @@ import com.android.systemui.R; import com.android.systemui.SysuiTestCase; import com.android.systemui.dump.DumpManager; import com.android.systemui.keyguard.KeyguardUnlockAnimationController; +import com.android.systemui.log.LogBuffer; import com.android.systemui.plugins.ClockAnimations; import com.android.systemui.plugins.ClockController; import com.android.systemui.plugins.ClockEvents; @@ -52,7 +53,6 @@ import com.android.systemui.plugins.ClockFaceConfig; import com.android.systemui.plugins.ClockFaceController; import com.android.systemui.plugins.ClockFaceEvents; import com.android.systemui.plugins.ClockTickRate; -import com.android.systemui.plugins.log.LogBuffer; import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.shared.clocks.AnimatableClockView; import com.android.systemui.shared.clocks.ClockRegistry; diff --git a/packages/SystemUI/tests/src/com/android/systemui/dump/DumpHandlerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/dump/DumpHandlerTest.kt index 19135d0cc800..e8cbdf3db327 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/dump/DumpHandlerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/dump/DumpHandlerTest.kt @@ -21,7 +21,7 @@ import com.android.systemui.CoreStartable import com.android.systemui.Dumpable import com.android.systemui.ProtoDumpable import com.android.systemui.SysuiTestCase -import com.android.systemui.plugins.log.LogBuffer +import com.android.systemui.log.LogBuffer import com.android.systemui.shared.system.UncaughtExceptionPreHandlerManager import com.android.systemui.util.mockito.any import com.android.systemui.util.mockito.eq diff --git a/packages/SystemUI/tests/src/com/android/systemui/dump/DumpManagerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/dump/DumpManagerTest.kt index 0c5a74cd39fa..d22c409d8590 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/dump/DumpManagerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/dump/DumpManagerTest.kt @@ -19,7 +19,7 @@ package com.android.systemui.dump import androidx.test.filters.SmallTest import com.android.systemui.Dumpable import com.android.systemui.SysuiTestCase -import com.android.systemui.plugins.log.LogBuffer +import com.android.systemui.log.LogBuffer import com.android.systemui.util.mockito.any import java.io.PrintWriter import org.junit.Before diff --git a/packages/SystemUI/tests/src/com/android/systemui/dump/LogBufferHelper.kt b/packages/SystemUI/tests/src/com/android/systemui/dump/LogBufferHelper.kt index 64547f4463d1..bd029a727ee3 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/dump/LogBufferHelper.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/dump/LogBufferHelper.kt @@ -16,9 +16,9 @@ package com.android.systemui.dump -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel -import com.android.systemui.plugins.log.LogcatEchoTracker +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel +import com.android.systemui.log.LogcatEchoTracker /** * Creates a LogBuffer that will echo everything to logcat, which is useful for debugging tests. diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/TrustRepositoryTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/TrustRepositoryTest.kt index bf3c73a2c94e..c2195c7bc2c1 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/TrustRepositoryTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/TrustRepositoryTest.kt @@ -24,8 +24,8 @@ import com.android.keyguard.logging.TrustRepositoryLogger import com.android.systemui.RoboPilotTest import com.android.systemui.SysuiTestCase import com.android.systemui.coroutines.collectLastValue -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogcatEchoTracker +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogcatEchoTracker import com.android.systemui.user.data.repository.FakeUserRepository import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.ExperimentalCoroutinesApi diff --git a/packages/SystemUI/tests/src/com/android/systemui/log/LogBufferTest.kt b/packages/SystemUI/tests/src/com/android/systemui/log/LogBufferTest.kt new file mode 100644 index 000000000000..0cf6d3da7e9c --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/log/LogBufferTest.kt @@ -0,0 +1,137 @@ +package com.android.systemui.log + +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import com.google.common.truth.Truth.assertThat +import java.io.PrintWriter +import java.io.StringWriter +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.Mock +import org.mockito.junit.MockitoJUnitRunner + +@SmallTest +@RunWith(MockitoJUnitRunner::class) +class LogBufferTest : SysuiTestCase() { + private lateinit var buffer: LogBuffer + + private lateinit var outputWriter: StringWriter + + @Mock private lateinit var logcatEchoTracker: LogcatEchoTracker + + @Before + fun setup() { + outputWriter = StringWriter() + buffer = createBuffer() + } + + private fun createBuffer(): LogBuffer { + return LogBuffer("TestBuffer", 1, logcatEchoTracker, false) + } + + @Test + fun log_shouldSaveLogToBuffer() { + buffer.log("Test", LogLevel.INFO, "Some test message") + + val dumpedString = dumpBuffer() + + assertThat(dumpedString).contains("Some test message") + } + + @Test + fun log_shouldRotateIfLogBufferIsFull() { + buffer.log("Test", LogLevel.INFO, "This should be rotated") + buffer.log("Test", LogLevel.INFO, "New test message") + + val dumpedString = dumpBuffer() + + assertThat(dumpedString).contains("New test message") + } + + @Test + fun dump_writesExceptionAndStacktrace() { + buffer = createBuffer() + val exception = createTestException("Exception message", "TestClass") + buffer.log("Tag", LogLevel.ERROR, { str1 = "Extra message" }, { str1!! }, exception) + + val dumpedString = dumpBuffer() + + assertThat(dumpedString).contains("Extra message") + assertThat(dumpedString).contains("java.lang.RuntimeException: Exception message") + assertThat(dumpedString).contains("at TestClass.TestMethod(TestClass.java:1)") + assertThat(dumpedString).contains("at TestClass.TestMethod(TestClass.java:2)") + } + + @Test + fun dump_writesCauseAndStacktrace() { + buffer = createBuffer() + val exception = + createTestException( + "Exception message", + "TestClass", + cause = createTestException("The real cause!", "TestClass") + ) + buffer.log("Tag", LogLevel.ERROR, { str1 = "Extra message" }, { str1!! }, exception) + + val dumpedString = dumpBuffer() + + assertThat(dumpedString).contains("Caused by: java.lang.RuntimeException: The real cause!") + assertThat(dumpedString).contains("at TestClass.TestMethod(TestClass.java:1)") + assertThat(dumpedString).contains("at TestClass.TestMethod(TestClass.java:2)") + } + + @Test + fun dump_writesSuppressedExceptionAndStacktrace() { + buffer = createBuffer() + val exception = RuntimeException("Root exception message") + exception.addSuppressed( + createTestException( + "First suppressed exception", + "FirstClass", + createTestException("Cause of suppressed exp", "ThirdClass") + ) + ) + exception.addSuppressed(createTestException("Second suppressed exception", "SecondClass")) + buffer.log("Tag", LogLevel.ERROR, { str1 = "Extra message" }, { str1!! }, exception) + + val dumpedStr = dumpBuffer() + + // first suppressed exception + assertThat(dumpedStr) + .contains("Suppressed: " + "java.lang.RuntimeException: First suppressed exception") + assertThat(dumpedStr).contains("at FirstClass.TestMethod(FirstClass.java:1)") + assertThat(dumpedStr).contains("at FirstClass.TestMethod(FirstClass.java:2)") + + assertThat(dumpedStr) + .contains("Caused by: java.lang.RuntimeException: Cause of suppressed exp") + assertThat(dumpedStr).contains("at ThirdClass.TestMethod(ThirdClass.java:1)") + assertThat(dumpedStr).contains("at ThirdClass.TestMethod(ThirdClass.java:2)") + + // second suppressed exception + assertThat(dumpedStr) + .contains("Suppressed: " + "java.lang.RuntimeException: Second suppressed exception") + assertThat(dumpedStr).contains("at SecondClass.TestMethod(SecondClass.java:1)") + assertThat(dumpedStr).contains("at SecondClass.TestMethod(SecondClass.java:2)") + } + + private fun createTestException( + message: String, + errorClass: String, + cause: Throwable? = null, + ): Exception { + val exception = RuntimeException(message, cause) + exception.stackTrace = + (1..5) + .map { lineNumber -> + StackTraceElement(errorClass, "TestMethod", "$errorClass.java", lineNumber) + } + .toTypedArray() + return exception + } + + private fun dumpBuffer(): String { + buffer.dump(PrintWriter(outputWriter), tailLength = 100) + return outputWriter.toString() + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/log/table/TableLogBufferTest.kt b/packages/SystemUI/tests/src/com/android/systemui/log/table/TableLogBufferTest.kt index f867fc7bf84a..12f46898ab8d 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/log/table/TableLogBufferTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/log/table/TableLogBufferTest.kt @@ -18,10 +18,10 @@ package com.android.systemui.log.table import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase +import com.android.systemui.log.LogLevel +import com.android.systemui.log.LogcatEchoTracker import com.android.systemui.log.table.TableChange.Companion.IS_INITIAL_PREFIX import com.android.systemui.log.table.TableChange.Companion.MAX_STRING_LENGTH -import com.android.systemui.plugins.log.LogLevel -import com.android.systemui.plugins.log.LogcatEchoTracker import com.android.systemui.util.mockito.any import com.android.systemui.util.mockito.eq import com.android.systemui.util.mockito.mock diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/common/MediaTttLoggerUtilsTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/common/MediaTttLoggerUtilsTest.kt index 8da1c646109d..b322bb7d6b46 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/common/MediaTttLoggerUtilsTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/common/MediaTttLoggerUtilsTest.kt @@ -19,9 +19,9 @@ package com.android.systemui.media.taptotransfer.common import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase import com.android.systemui.dump.DumpManager +import com.android.systemui.log.LogBuffer import com.android.systemui.log.LogBufferFactory -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogcatEchoTracker +import com.android.systemui.log.LogcatEchoTracker import com.google.common.truth.Truth.assertThat import java.io.PrintWriter import java.io.StringWriter diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/receiver/MediaTttReceiverLoggerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/receiver/MediaTttReceiverLoggerTest.kt index 95df484cddc2..64f3fd304ca6 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/receiver/MediaTttReceiverLoggerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/receiver/MediaTttReceiverLoggerTest.kt @@ -19,9 +19,9 @@ package com.android.systemui.media.taptotransfer.receiver import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase import com.android.systemui.dump.DumpManager +import com.android.systemui.log.LogBuffer import com.android.systemui.log.LogBufferFactory -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogcatEchoTracker +import com.android.systemui.log.LogcatEchoTracker import com.google.common.truth.Truth.assertThat import java.io.PrintWriter import java.io.StringWriter diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/sender/MediaTttSenderLoggerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/sender/MediaTttSenderLoggerTest.kt index 003375709a16..2287da572795 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/sender/MediaTttSenderLoggerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/sender/MediaTttSenderLoggerTest.kt @@ -19,9 +19,9 @@ package com.android.systemui.media.taptotransfer.sender import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase import com.android.systemui.dump.DumpManager +import com.android.systemui.log.LogBuffer import com.android.systemui.log.LogBufferFactory -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogcatEchoTracker +import com.android.systemui.log.LogcatEchoTracker import com.google.common.truth.Truth.assertThat import java.io.PrintWriter import java.io.StringWriter diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/QSFragmentDisableFlagsLoggerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/qs/QSFragmentDisableFlagsLoggerTest.kt index 68c10f20f6f7..aacc695ef301 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/QSFragmentDisableFlagsLoggerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/QSFragmentDisableFlagsLoggerTest.kt @@ -20,7 +20,7 @@ import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase import com.android.systemui.dump.DumpManager import com.android.systemui.log.LogBufferFactory -import com.android.systemui.plugins.log.LogcatEchoTracker +import com.android.systemui.log.LogcatEchoTracker import com.android.systemui.statusbar.disableflags.DisableFlagsLogger import com.google.common.truth.Truth.assertThat import java.io.PrintWriter diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/LSShadeTransitionLoggerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/LSShadeTransitionLoggerTest.kt index 5fc0ffe42f55..8cb530c355bd 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/LSShadeTransitionLoggerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/LSShadeTransitionLoggerTest.kt @@ -4,7 +4,7 @@ import android.testing.AndroidTestingRunner import android.util.DisplayMetrics import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase -import com.android.systemui.plugins.log.LogBuffer +import com.android.systemui.log.LogBuffer import com.android.systemui.statusbar.notification.row.ExpandableView import com.android.systemui.statusbar.phone.LSShadeTransitionLogger import com.android.systemui.statusbar.phone.LockscreenGestureLogger diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/NetworkControllerBaseTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/NetworkControllerBaseTest.java index 5431eba8441c..c7ea09cb519d 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/NetworkControllerBaseTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/NetworkControllerBaseTest.java @@ -70,7 +70,7 @@ import com.android.systemui.SysuiTestCase; import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.demomode.DemoModeController; import com.android.systemui.dump.DumpManager; -import com.android.systemui.plugins.log.LogBuffer; +import com.android.systemui.log.LogBuffer; import com.android.systemui.settings.UserTracker; import com.android.systemui.statusbar.pipeline.StatusBarPipelineFlags; import com.android.systemui.statusbar.pipeline.mobile.util.FakeMobileMappingsProxy; diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/NetworkControllerDataTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/NetworkControllerDataTest.java index 9441d49d454a..d5689dcb3173 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/NetworkControllerDataTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/NetworkControllerDataTest.java @@ -48,7 +48,7 @@ import com.android.settingslib.SignalIcon.MobileIconGroup; import com.android.settingslib.mobile.TelephonyIcons; import com.android.settingslib.net.DataUsageController; import com.android.systemui.dump.DumpManager; -import com.android.systemui.plugins.log.LogBuffer; +import com.android.systemui.log.LogBuffer; import com.android.systemui.statusbar.pipeline.StatusBarPipelineFlags; import com.android.systemui.statusbar.policy.DeviceProvisionedController; import com.android.systemui.util.CarrierConfigTracker; diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/NetworkControllerSignalTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/NetworkControllerSignalTest.java index 4c1f0a8a1066..35b9814cd81d 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/NetworkControllerSignalTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/NetworkControllerSignalTest.java @@ -43,7 +43,7 @@ import com.android.settingslib.mobile.TelephonyIcons; import com.android.settingslib.net.DataUsageController; import com.android.systemui.R; import com.android.systemui.dump.DumpManager; -import com.android.systemui.plugins.log.LogBuffer; +import com.android.systemui.log.LogBuffer; import com.android.systemui.statusbar.pipeline.StatusBarPipelineFlags; import com.android.systemui.statusbar.policy.DeviceProvisionedController; import com.android.systemui.util.CarrierConfigTracker; diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationWakeUpCoordinatorLoggerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationWakeUpCoordinatorLoggerTest.kt index bef9fcb5697c..a37c38669bfd 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationWakeUpCoordinatorLoggerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationWakeUpCoordinatorLoggerTest.kt @@ -19,9 +19,9 @@ package com.android.systemui.statusbar.notification import android.testing.AndroidTestingRunner import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogLevel -import com.android.systemui.plugins.log.LogcatEchoTracker +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel +import com.android.systemui.log.LogcatEchoTracker import com.android.systemui.statusbar.StatusBarState import com.google.common.truth.Truth.assertThat import org.junit.Before diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragmentLoggerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragmentLoggerTest.kt index 3a0a94ddd511..65e2964ea332 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragmentLoggerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragmentLoggerTest.kt @@ -20,7 +20,7 @@ import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase import com.android.systemui.dump.DumpManager import com.android.systemui.log.LogBufferFactory -import com.android.systemui.plugins.log.LogcatEchoTracker +import com.android.systemui.log.LogcatEchoTracker import com.android.systemui.statusbar.disableflags.DisableFlagsLogger import com.google.common.truth.Truth.assertThat import java.io.PrintWriter diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragmentTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragmentTest.java index 2a3c775eaf54..4b1caca86bea 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragmentTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragmentTest.java @@ -52,9 +52,9 @@ import com.android.systemui.R; import com.android.systemui.SysuiBaseFragmentTest; import com.android.systemui.dump.DumpManager; import com.android.systemui.flags.FeatureFlags; +import com.android.systemui.log.LogBuffer; +import com.android.systemui.log.LogcatEchoTracker; import com.android.systemui.plugins.DarkIconDispatcher; -import com.android.systemui.plugins.log.LogBuffer; -import com.android.systemui.plugins.log.LogcatEchoTracker; import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.shade.ShadeExpansionStateManager; import com.android.systemui.shade.ShadeViewController; diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/shared/data/model/DefaultConnectionModelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/shared/data/model/DefaultConnectionModelTest.kt index 03cd94fa9d70..c43778a4ae51 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/shared/data/model/DefaultConnectionModelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/shared/data/model/DefaultConnectionModelTest.kt @@ -18,7 +18,7 @@ package com.android.systemui.statusbar.pipeline.shared.data.model import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase -import com.android.systemui.plugins.log.LogMessageImpl +import com.android.systemui.log.LogMessageImpl import com.google.common.truth.Truth.assertThat import org.junit.Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/temporarydisplay/TemporaryViewLoggerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/temporarydisplay/TemporaryViewLoggerTest.kt index 2e66b205bfd5..451424927b23 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/temporarydisplay/TemporaryViewLoggerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/temporarydisplay/TemporaryViewLoggerTest.kt @@ -19,9 +19,9 @@ package com.android.systemui.temporarydisplay import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase import com.android.systemui.dump.DumpManager +import com.android.systemui.log.LogBuffer import com.android.systemui.log.LogBufferFactory -import com.android.systemui.plugins.log.LogBuffer -import com.android.systemui.plugins.log.LogcatEchoTracker +import com.android.systemui.log.LogcatEchoTracker import com.google.common.truth.Truth.assertThat import java.io.PrintWriter import java.io.StringWriter -- cgit v1.2.3-59-g8ed1b