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

Merge "DO NOT MERGE Log remote exceptions in NotifCollection" into rvc-dev

Browse Source
This commit is contained in:
Ned Burns
2020-04-01 17:53:27 +00:00
committed by Android (Google) Code Review
parent db3c760032 3dec27fff4
commit b4205b32b0
2 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -249,6 +249,7 @@ public class NotifCollection implements Dumpable {
stats.notificationVisibility);
} catch (RemoteException e) {
// system process is dead if we're here.
mLogger.logRemoteExceptionOnNotificationClear(entry.getKey(), e);
}
}
}
@@ -277,6 +278,7 @@ public class NotifCollection implements Dumpable {
mStatusBarService.onClearAllNotifications(userId);
} catch (RemoteException e) {
// system process is dead if we're here.
mLogger.logRemoteExceptionOnClearAllNotifications(e);
}
final List<NotificationEntry> entries = new ArrayList<>(getAllNotifs());
@@ -743,6 +745,6 @@ public class NotifCollection implements Dumpable {
@Retention(RetentionPolicy.SOURCE)
public @interface CancellationReason {}
public static final int REASON_NOT_CANCELED = -1;
static final int REASON_NOT_CANCELED = -1;
public static final int REASON_UNKNOWN = 0;
}

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

@@ -16,11 +16,13 @@
package com.android.systemui.statusbar.notification.collection.notifcollection
import android.os.RemoteException
import android.service.notification.NotificationListenerService.RankingMap
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.log.LogLevel.WTF
import com.android.systemui.log.dagger.NotificationLog
import javax.inject.Inject
@@ -92,6 +94,23 @@ class NotifCollectionLogger @Inject constructor(
buffer.log(TAG, DEBUG, { str1 = entry }, { " $str1" })
}
}
fun logRemoteExceptionOnNotificationClear(key: String, e: RemoteException) {
buffer.log(TAG, WTF, {
str1 = key
str2 = e.toString()
}, {
"RemoteException while attempting to clear $str1:\n$str2"
})
}
fun logRemoteExceptionOnClearAllNotifications(e: RemoteException) {
buffer.log(TAG, WTF, {
str1 = e.toString()
}, {
"RemoteException while attempting to clear all notifications:\n$str1"
})
}
}
private const val TAG = "NotifCollection"
private const val TAG = "NotifCollection"