From bc84aecc76b75fb8a4fa9df10f3cc84dbaf4a5d4 Mon Sep 17 00:00:00 2001 From: Kweku Adams Date: Tue, 23 Jan 2018 13:33:12 -0800 Subject: Fixing bugs in Notification proto dumping. Also changing method signatures to be more in line with our convention. Based on some of the changes I went through, it looks like: 1. We were only legitimately saving the very last NotificationRecord that was dumped. 2. We weren't dumping any NotificationChannels into NotificationChannelGroup protos. Bug: 65750824 Test: Android builds Change-Id: I8c1ef90cf69d8ea00a7bad0c67445741056e23ef --- core/java/android/app/NotificationChannelGroup.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'core/java/android/app/NotificationChannelGroup.java') diff --git a/core/java/android/app/NotificationChannelGroup.java b/core/java/android/app/NotificationChannelGroup.java index 5cb7fb7a6707..16166f7cf1cf 100644 --- a/core/java/android/app/NotificationChannelGroup.java +++ b/core/java/android/app/NotificationChannelGroup.java @@ -298,13 +298,17 @@ public final class NotificationChannelGroup implements Parcelable { } /** @hide */ - public void toProto(ProtoOutputStream proto) { + public void writeToProto(ProtoOutputStream proto, long fieldId) { + final long token = proto.start(fieldId); + proto.write(NotificationChannelGroupProto.ID, mId); proto.write(NotificationChannelGroupProto.NAME, mName.toString()); proto.write(NotificationChannelGroupProto.DESCRIPTION, mDescription); proto.write(NotificationChannelGroupProto.IS_BLOCKED, mBlocked); for (NotificationChannel channel : mChannels) { - channel.toProto(proto); + channel.writeToProto(proto, NotificationChannelGroupProto.CHANNELS); } + + proto.end(token); } } -- cgit v1.2.3