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

Commit 10a988b2 authored by Darrell Shi's avatar Darrell Shi Committed by Android (Google) Code Review
Browse files

Merge "Move LogLevel and LogMessage to log/core." into udc-qpr-dev

parents 8e4bdb9c 2e15a993

packages/SystemUI/customization/src/com/android/systemui/shared/clocks/AnimatableClockView.kt

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ import com.android.systemui.animation.GlyphCallback 
import com.android.systemui.animation.TextAnimator

import com.android.systemui.customization.R

import com.android.systemui.log.LogBuffer

import com.android.systemui.log.LogLevel.DEBUG

import com.android.systemui.log.core.LogLevel.DEBUG

import java.io.PrintWriter

import java.util.Calendar

import java.util.Locale

packages/SystemUI/customization/src/com/android/systemui/shared/clocks/ClockRegistry.kt

+4 −4
Original line number Diff line number Diff line
@@ -24,11 +24,11 @@ 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.log.core.LogLevel

import com.android.systemui.log.core.LogMessage

import com.android.systemui.log.core.MessageInitializer

import com.android.systemui.log.core.MessagePrinter

import com.android.systemui.plugins.ClockController

import com.android.systemui.plugins.ClockId

import com.android.systemui.plugins.ClockMetadata

packages/SystemUI/log/src/com/android/systemui/log/ConstantStringsLoggerImpl.kt

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.systemui.log



import com.android.systemui.log.core.LogLevel

import com.google.errorprone.annotations.CompileTimeConstant



class ConstantStringsLoggerImpl(val buffer: LogBuffer, val tag: String) : ConstantStringsLogger {

packages/SystemUI/log/src/com/android/systemui/log/LogBuffer.kt

+4 −6
Original line number Diff line number Diff line
@@ -19,6 +19,10 @@ package com.android.systemui.log 
import android.os.Trace

import android.util.Log

import com.android.systemui.common.buffer.RingBuffer

import com.android.systemui.log.core.LogLevel

import com.android.systemui.log.core.LogMessage

import com.android.systemui.log.core.MessageInitializer

import com.android.systemui.log.core.MessagePrinter

import com.google.errorprone.annotations.CompileTimeConstant

import java.io.PrintWriter

import java.util.concurrent.ArrayBlockingQueue
@@ -292,11 +296,5 @@ constructor( 
    }

}



/**

 * 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()

packages/SystemUI/log/src/com/android/systemui/log/LogMessageImpl.kt

+4 −0
Original line number Diff line number Diff line
@@ -16,6 +16,10 @@ 


package com.android.systemui.log



import com.android.systemui.log.core.LogLevel

import com.android.systemui.log.core.LogMessage

import com.android.systemui.log.core.MessagePrinter



/** Recyclable implementation of [LogMessage]. */

data class LogMessageImpl(

    override var level: LogLevel,