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

Merge "Log a warning whenever we get an incomplete ranking map"

Browse Source
This commit is contained in:
Ned Burns
2020-02-03 23:07:10 +00:00
committed by Android (Google) Code Review
parent bc084d53ce 8cd2f1d380
commit 5a1680ded1
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifCollection.java
View File

@@ -326,6 +326,8 @@ public class NotifCollection implements Dumpable {
entry.getSbn().setOverrideGroupKey(newOverrideGroupKey);
}
}
} else {
mLogger.logRankingMissing(entry.getKey(), rankingMap);
}
}
}

21
packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/notifcollection/NotifCollectionLogger.kt
View File

@@ -16,8 +16,11 @@
package com.android.systemui.statusbar.notification.collection.notifcollection
import android.service.notification.NotificationListenerService.RankingMap
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.LogLevel.WARNING
import com.android.systemui.log.dagger.NotificationLog
import javax.inject.Inject
@@ -25,7 +28,7 @@ class NotifCollectionLogger @Inject constructor(
@NotificationLog private val buffer: LogBuffer
) {
fun logNotifPosted(key: String) {
buffer.log(TAG, LogLevel.INFO, {
buffer.log(TAG, INFO, {
str1 = key
}, {
"POSTED $str1"
@@ -33,7 +36,7 @@ class NotifCollectionLogger @Inject constructor(
}
fun logNotifGroupPosted(groupKey: String, batchSize: Int) {
buffer.log(TAG, LogLevel.INFO, {
buffer.log(TAG, INFO, {
str1 = groupKey
int1 = batchSize
}, {
@@ -42,7 +45,7 @@ class NotifCollectionLogger @Inject constructor(
}
fun logNotifUpdated(key: String) {
buffer.log(TAG, LogLevel.INFO, {
buffer.log(TAG, INFO, {
str1 = key
}, {
"UPDATED $str1"
@@ -50,13 +53,21 @@ class NotifCollectionLogger @Inject constructor(
}
fun logNotifRemoved(key: String, reason: Int) {
buffer.log(TAG, LogLevel.INFO, {
buffer.log(TAG, INFO, {
str1 = key
int1 = reason
}, {
"REMOVED $str1 reason=$int1"
})
}
fun logRankingMissing(key: String, rankingMap: RankingMap) {
buffer.log(TAG, WARNING, { str1 = key }, { "Ranking update is missing ranking for $str1" })
buffer.log(TAG, DEBUG, {}, { "Ranking map contents:" })
for (entry in rankingMap.orderedKeys) {
buffer.log(TAG, DEBUG, { str1 = entry }, { " $str1" })
}
}
}
private const val TAG = "NotifCollection"