From 93abac48bb2586dcd891987c22fcae57eb56b410 Mon Sep 17 00:00:00 2001 From: Chris Wren Date: Tue, 23 Jun 2015 11:23:37 -0400 Subject: [PATCH] collect more stats about the notification API 3.5 times as many bytes, at 1/4th the frequency, so a net reduction in log size, although it'll seem like an increase due to being bursty and therefore more noticable. Bug: 21530763 Change-Id: Icb1a1a1b0dcd4fd8b3c24f317d39b38f1591757e --- .../notification/NotificationUsageStats.java | 143 +++++++++++++++++- 1 file changed, 139 insertions(+), 4 deletions(-) diff --git a/services/core/java/com/android/server/notification/NotificationUsageStats.java b/services/core/java/com/android/server/notification/NotificationUsageStats.java index 2d5c1998c1e27..3f181893c7abf 100644 --- a/services/core/java/com/android/server/notification/NotificationUsageStats.java +++ b/services/core/java/com/android/server/notification/NotificationUsageStats.java @@ -16,11 +16,13 @@ package com.android.server.notification; +import android.app.Notification; import android.content.ContentValues; import android.content.Context; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; +import android.os.Bundle; import android.os.Handler; import android.os.HandlerThread; import android.os.Message; @@ -57,8 +59,8 @@ public class NotificationUsageStats { private static final boolean DEBUG = false; public static final int TEN_SECONDS = 1000 * 10; - public static final int ONE_HOUR = 1000 * 60 * 60; - private static final long EMIT_PERIOD = DEBUG ? TEN_SECONDS : ONE_HOUR; + public static final int FOUR_HOURS = 1000 * 60 * 60 * 4; + private static final long EMIT_PERIOD = DEBUG ? TEN_SECONDS : FOUR_HOURS; // Guarded by synchronized(this). private final Map mStats = new HashMap<>(); @@ -66,6 +68,7 @@ public class NotificationUsageStats { private final SQLiteLog mSQLiteLog; private final Context mContext; private final Handler mHandler; + private final Handler mHandler; private long mLastEmitTime; public NotificationUsageStats(Context context) { @@ -98,6 +101,7 @@ public class NotificationUsageStats { AggregatedStats[] aggregatedStatsArray = getAggregatedStatsLocked(notification); for (AggregatedStats stats : aggregatedStatsArray) { stats.numPostedByApp++; + stats.countApiUse(notification); } releaseAggregatedStatsLocked(aggregatedStatsArray); if (ENABLE_SQLITE_LOG) { @@ -113,6 +117,7 @@ public class NotificationUsageStats { AggregatedStats[] aggregatedStatsArray = getAggregatedStatsLocked(notification); for (AggregatedStats stats : aggregatedStatsArray) { stats.numUpdatedByApp++; + stats.countApiUse(notification); } releaseAggregatedStatsLocked(aggregatedStatsArray); } @@ -246,6 +251,7 @@ public class NotificationUsageStats { private final Context mContext; public final String key; + private AggregatedStats mPrevious; // ---- Updated as the respective events occur. public int numPostedByApp; @@ -256,14 +262,103 @@ public class NotificationUsageStats { public int numWithStaredPeople; public int numWithValidPeople; public int numBlocked; - - private AggregatedStats mPrevious; + public int numWithActions; + public int numPrivate; + public int numSecret; + public int numPriorityMax; + public int numPriorityHigh; + public int numPriorityLow; + public int numPriorityMin; + public int numWithBigText; + public int numWithBigPicture; + public int numForegroundService; + public int numOngoing; + public int numAutoCancel; + public int numWithLargeIcon; + public int numWithInbox; + public int numWithMediaSession; + public int numWithTitle; + public int numWithText; + public int numWithSubText; + public int numWithInfoText; + public int numInterrupt; public AggregatedStats(Context context, String key) { this.key = key; mContext = context; } + public void countApiUse(NotificationRecord record) { + final Notification n = record.getNotification(); + if (n.actions != null) { + numWithActions++; + } + + if ((n.flags & Notification.FLAG_FOREGROUND_SERVICE) != 0) { + numForegroundService++; + } + + if ((n.flags & Notification.FLAG_ONGOING_EVENT) != 0) { + numOngoing++; + } + + if ((n.flags & Notification.FLAG_AUTO_CANCEL) != 0) { + numAutoCancel++; + } + + if ((n.defaults & Notification.DEFAULT_SOUND) != 0 || + (n.defaults & Notification.DEFAULT_VIBRATE) != 0 || + n.sound != null || n.vibrate != null) { + numInterrupt++; + } + + switch (n.visibility) { + case Notification.VISIBILITY_PRIVATE: + numPrivate++; + break; + case Notification.VISIBILITY_SECRET: + numSecret++; + break; + } + + switch (n.priority) { + case Notification.PRIORITY_MAX: + numPriorityMax++; + break; + case Notification.PRIORITY_HIGH: + numPriorityHigh++; + break; + case Notification.PRIORITY_LOW: + numPriorityLow++; + break; + case Notification.PRIORITY_MIN: + numPriorityMin++; + break; + } + + for (String Key : n.extras.keySet()) { + if (Notification.EXTRA_BIG_TEXT.equals(key)) { + numWithBigText++; + } else if (Notification.EXTRA_PICTURE.equals(key)) { + numWithBigPicture++; + } else if (Notification.EXTRA_LARGE_ICON.equals(key)) { + numWithLargeIcon++; + } else if (Notification.EXTRA_TEXT_LINES.equals(key)) { + numWithInbox++; + } else if (Notification.EXTRA_MEDIA_SESSION.equals(key)) { + numWithMediaSession++; + } else if (Notification.EXTRA_TITLE.equals(key)) { + numWithTitle++; + } else if (Notification.EXTRA_TEXT.equals(key)) { + numWithText++; + } else if (Notification.EXTRA_SUB_TEXT.equals(key)) { + numWithSubText++; + } else if (Notification.EXTRA_INFO_TEXT.equals(key)) { + numWithInfoText++; + } + } + } + public void emit() { if (mPrevious == null) { mPrevious = new AggregatedStats(null, key); @@ -277,6 +372,26 @@ public class NotificationUsageStats { maybeCount("people_cache_hit", (numPeopleCacheHit - mPrevious.numPeopleCacheHit)); maybeCount("people_cache_miss", (numPeopleCacheMiss - mPrevious.numPeopleCacheMiss)); maybeCount("note_blocked", (numBlocked - mPrevious.numBlocked)); + maybeCount("note_with_actions", (numWithActions - mPrevious.numWithActions)); + maybeCount("note_private", (numPrivate - mPrevious.numPrivate)); + maybeCount("note_secret", (numSecret - mPrevious.numSecret)); + maybeCount("note_prio_max", (numPriorityMax - mPrevious.numPriorityMax)); + maybeCount("note_prio_high", (numPriorityHigh - mPrevious.numPriorityHigh)); + maybeCount("note_prio_low", (numPriorityLow - mPrevious.numPriorityLow)); + maybeCount("note_prio_min", (numPriorityMin - mPrevious.numPriorityMin)); + maybeCount("note_interupt", (numInterrupt - mPrevious.numInterrupt)); + maybeCount("note_big_text", (numWithBigText - mPrevious.numWithBigText)); + maybeCount("note_big_pic", (numWithBigPicture - mPrevious.numWithBigPicture)); + maybeCount("note_fg", (numForegroundService - mPrevious.numForegroundService)); + maybeCount("note_ongoing", (numOngoing - mPrevious.numOngoing)); + maybeCount("note_auto", (numAutoCancel - mPrevious.numAutoCancel)); + maybeCount("note_large_icon", (numWithLargeIcon - mPrevious.numWithLargeIcon)); + maybeCount("note_inbox", (numWithInbox - mPrevious.numWithInbox)); + maybeCount("note_media", (numWithMediaSession - mPrevious.numWithMediaSession)); + maybeCount("note_title", (numWithTitle - mPrevious.numWithTitle)); + maybeCount("note_text", (numWithText - mPrevious.numWithText)); + maybeCount("note_sub_text", (numWithSubText - mPrevious.numWithSubText)); + maybeCount("note_info_text", (numWithInfoText - mPrevious.numWithInfoText)); mPrevious.numPostedByApp = numPostedByApp; mPrevious.numUpdatedByApp = numUpdatedByApp; @@ -286,6 +401,26 @@ public class NotificationUsageStats { mPrevious.numWithStaredPeople = numWithStaredPeople; mPrevious.numWithValidPeople = numWithValidPeople; mPrevious.numBlocked = numBlocked; + mPrevious.numWithActions = numWithActions; + mPrevious.numPrivate = numPrivate; + mPrevious.numSecret = numSecret; + mPrevious.numPriorityMax = numPriorityMax; + mPrevious.numPriorityHigh = numPriorityHigh; + mPrevious.numPriorityLow = numPriorityLow; + mPrevious.numPriorityMin = numPriorityMin; + mPrevious.numInterrupt = numInterrupt; + mPrevious.numWithBigText = numWithBigText; + mPrevious.numWithBigPicture = numWithBigPicture; + mPrevious.numForegroundService = numForegroundService; + mPrevious.numOngoing = numOngoing; + mPrevious.numAutoCancel = numAutoCancel; + mPrevious.numWithLargeIcon = numWithLargeIcon; + mPrevious.numWithInbox = numWithInbox; + mPrevious.numWithMediaSession = numWithMediaSession; + mPrevious.numWithTitle = numWithTitle; + mPrevious.numWithText = numWithText; + mPrevious.numWithSubText = numWithSubText; + mPrevious.numWithInfoText = numWithInfoText; } void maybeCount(String name, int value) {