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

Commit 3b943e77 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Create a valid TYPE for the NOTIFICATION_ASSISTANT_ADJUSTMENT Tron log... 

Merge "Create a valid TYPE for the NOTIFICATION_ASSISTANT_ADJUSTMENT Tron log message, and switch the code to use it.  Using the same enum value as before to avoid a discontinuity in the logs."
parents 51997272 2a1e6b85

proto/src/metrics_constants/metrics_constants.proto

+4 −0
Original line number Diff line number Diff line
@@ -73,6 +73,10 @@ message MetricsEvent { 


    // The view switched to summary mode (most relevant for notifications)

    TYPE_COLLAPSE = 14;



    // The notification was adjusted by the assistant. Enum value is

    // out of sequence due to b/122737498.

    TYPE_NOTIFICATION_ASSISTANT_ADJUSTMENT = 1573;

  }



  // Types of alerts, as bit field values

services/core/java/com/android/server/notification/NotificationRecord.java

+1 −1
Original line number Diff line number Diff line
@@ -1263,7 +1263,7 @@ public final class NotificationRecord { 
    public LogMaker getAdjustmentLogMaker() {

        return getLogMaker()

                .setCategory(MetricsEvent.NOTIFICATION_ITEM)

                .setType(MetricsEvent.NOTIFICATION_ASSISTANT_ADJUSTMENT);

                .setType(MetricsEvent.TYPE_NOTIFICATION_ASSISTANT_ADJUSTMENT);

    }



    @VisibleForTesting