Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Reduce log noise in KeyguardUpdateMonitorLog" into udc-dev am: ef8613af3b

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

Change-Id: I75fbdc0f178bf972520bea794957f33289f85c64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chandru S
2023-06-05 17:08:06 +00:00
committed by Automerger Merge Worker
parent ab37fe08c6 ef8613af3b
commit 18d2a34ff8
2 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
View File

@@ -3565,7 +3565,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
*/ */
private void handleTimeUpdate() { private void handleTimeUpdate() {
Assert.isMainThread(); Assert.isMainThread();
mLogger.d("handleTimeUpdate");
for (int i = 0; i < mCallbacks.size(); i++) { for (int i = 0; i < mCallbacks.size(); i++) {
KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get(); KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get();
if (cb != null) { if (cb != null) {
@@ -3630,9 +3629,9 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
private void handleBatteryUpdate(BatteryStatus status) { private void handleBatteryUpdate(BatteryStatus status) {
Assert.isMainThread(); Assert.isMainThread();
final boolean batteryUpdateInteresting = isBatteryUpdateInteresting(mBatteryStatus, status); final boolean batteryUpdateInteresting = isBatteryUpdateInteresting(mBatteryStatus, status);
mLogger.logHandleBatteryUpdate(batteryUpdateInteresting);
mBatteryStatus = status; mBatteryStatus = status;
if (batteryUpdateInteresting) { if (batteryUpdateInteresting) {
mLogger.logHandleBatteryUpdate(mBatteryStatus);
for (int i = 0; i < mCallbacks.size(); i++) { for (int i = 0; i < mCallbacks.size(); i++) {
KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get(); KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get();
if (cb != null) { if (cb != null) {

26
packages/SystemUI/src/com/android/keyguard/logging/KeyguardUpdateMonitorLogger.kt
View File

@@ -30,7 +30,7 @@ import com.android.keyguard.FaceAuthUiEvent
import com.android.keyguard.KeyguardListenModel import com.android.keyguard.KeyguardListenModel
import com.android.keyguard.KeyguardUpdateMonitorCallback import com.android.keyguard.KeyguardUpdateMonitorCallback
import com.android.keyguard.TrustGrantFlags import com.android.keyguard.TrustGrantFlags
import com.android.systemui.log.dagger.KeyguardUpdateMonitorLog import com.android.settingslib.fuelgauge.BatteryStatus
import com.android.systemui.log.LogBuffer import com.android.systemui.log.LogBuffer
import com.android.systemui.log.LogLevel import com.android.systemui.log.LogLevel
import com.android.systemui.log.LogLevel.DEBUG import com.android.systemui.log.LogLevel.DEBUG
@@ -38,6 +38,7 @@ import com.android.systemui.log.LogLevel.ERROR
import com.android.systemui.log.LogLevel.INFO import com.android.systemui.log.LogLevel.INFO
import com.android.systemui.log.LogLevel.VERBOSE import com.android.systemui.log.LogLevel.VERBOSE
import com.android.systemui.log.LogLevel.WARNING import com.android.systemui.log.LogLevel.WARNING
import com.android.systemui.log.dagger.KeyguardUpdateMonitorLog
import com.google.errorprone.annotations.CompileTimeConstant import com.google.errorprone.annotations.CompileTimeConstant
import javax.inject.Inject import javax.inject.Inject
@@ -683,8 +684,27 @@ constructor(@KeyguardUpdateMonitorLog private val logBuffer: LogBuffer) {
) )
} }
fun logHandleBatteryUpdate(isInteresting: Boolean) { fun logHandleBatteryUpdate(batteryStatus: BatteryStatus?) {
logBuffer.log(TAG, DEBUG, { bool1 = isInteresting }, { "handleBatteryUpdate: $bool1" }) logBuffer.log(
TAG,
DEBUG,
{
bool1 = batteryStatus != null
int1 = batteryStatus?.status ?: -1
int2 = batteryStatus?.chargingStatus ?: -1
long1 = (batteryStatus?.level ?: -1).toLong()
long2 = (batteryStatus?.maxChargingWattage ?: -1).toLong()
str1 = "${batteryStatus?.plugged ?: -1}"
},
{
"handleBatteryUpdate: isNotNull: $bool1 " +
"BatteryStatus{status= $int1, " +
"level=$long1, " +
"plugged=$str1, " +
"chargingStatus=$int2, " +
"maxChargingWattage= $long2}"
}
)
} }
fun scheduleWatchdog(@CompileTimeConstant watchdogType: String) { fun scheduleWatchdog(@CompileTimeConstant watchdogType: String) {