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

Commit 15ca6b36 authored by Jeff DeCew's avatar Jeff DeCew Committed by Automerger Merge Worker
Browse files

Merge "Use android.icu.text.SimpleDateFormat to speed up LogBuffer dumping"... 

Merge "Use android.icu.text.SimpleDateFormat to speed up LogBuffer dumping" into udc-dev am: d83febad am: f4a0cb71

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



Change-Id: I12e5dfe804b67ae59f6d99fe8f234d97fc14aec0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2f6fc750 f4a0cb71

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

+1 −1
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 


package com.android.systemui.log



import android.icu.text.SimpleDateFormat

import java.io.PrintWriter

import java.text.SimpleDateFormat

import java.util.Locale



/**

packages/SystemUI/src/com/android/systemui/dump/LogBufferEulogizer.kt

+1 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.systemui.dump



import android.content.Context

import android.icu.text.SimpleDateFormat

import android.util.Log

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.log.LogBuffer
@@ -30,7 +31,6 @@ import java.nio.file.Paths 
import java.nio.file.StandardOpenOption.CREATE

import java.nio.file.StandardOpenOption.TRUNCATE_EXISTING

import java.nio.file.attribute.BasicFileAttributes

import java.text.SimpleDateFormat

import java.util.Locale

import java.util.concurrent.TimeUnit

import javax.inject.Inject

packages/SystemUI/src/com/android/systemui/log/table/TableLogBuffer.kt

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


package com.android.systemui.log.table



import android.icu.text.SimpleDateFormat

import android.os.Trace

import com.android.systemui.Dumpable

import com.android.systemui.common.buffer.RingBuffer
@@ -24,7 +25,6 @@ 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

import java.util.Locale

import kotlinx.coroutines.CoroutineDispatcher

import kotlinx.coroutines.CoroutineScope

packages/SystemUI/src/com/android/systemui/privacy/logging/PrivacyLogger.kt

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


package com.android.systemui.privacy.logging



import android.icu.text.SimpleDateFormat

import android.permission.PermissionGroupUsage

import com.android.systemui.log.dagger.PrivacyLog

import com.android.systemui.log.LogBuffer
@@ -23,7 +24,6 @@ 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

import java.util.Locale

import javax.inject.Inject

packages/SystemUI/src/com/android/systemui/shade/NPVCDownEventState.kt

+1 −1
Original line number Diff line number Diff line
@@ -13,11 +13,11 @@ 
 */

package com.android.systemui.shade



import android.icu.text.SimpleDateFormat

import android.view.MotionEvent

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

import com.android.systemui.dump.DumpsysTableLogger

import com.android.systemui.dump.Row

import java.text.SimpleDateFormat

import java.util.Locale



/** Container for storing information about [MotionEvent.ACTION_DOWN] on