Merge "Revert "Revert "Notification statsd logs: Notification panel.""" into... (bb9e231f) · Commits · e / os / android_frameworks_base

core/java/android/service/notification/StatusBarNotification.java

+13 −5

Original line number	Diff line number	Diff line
		@@ -237,16 +237,24 @@ public class StatusBarNotification implements Parcelable {
		public StatusBarNotification cloneLight() {
		final Notification no = new Notification();
		this.notification.cloneInto(no, false); // light copy
		return new StatusBarNotification(this.pkg, this.opPkg,
		this.id, this.tag, this.uid, this.initialPid,
		no, this.user, this.overrideGroupKey, this.postTime);
		return cloneShallow(no);
		}

		@Override
		public StatusBarNotification clone() {
		return new StatusBarNotification(this.pkg, this.opPkg,
		return cloneShallow(this.notification.clone());
		}

		/**
		* @param notification Some kind of clone of this.notification.
		* @return A shallow copy of self, with notification in place of this.notification.
		*/
		StatusBarNotification cloneShallow(Notification notification) {
		StatusBarNotification result = new StatusBarNotification(this.pkg, this.opPkg,
		this.id, this.tag, this.uid, this.initialPid,
		this.notification.clone(), this.user, this.overrideGroupKey, this.postTime);
		notification, this.user, this.overrideGroupKey, this.postTime);
		result.setInstanceId(this.mInstanceId);
		return result;
		}

		@Override

core/java/com/android/internal/logging/InstanceId.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -48,6 +48,17 @@ public final class InstanceId implements Parcelable {
		return mId;
		}

		/**
		* Create a fake instance ID for testing purposes. Not for production use. See also
		* InstanceIdSequenceFake, which is a testing replacement for InstanceIdSequence.
		* @param id The ID you want to assign.
		* @return new InstanceId.
		*/
		@VisibleForTesting
		public static InstanceId fakeInstanceId(int id) {
		return new InstanceId(id);
		}

		@Override
		public int hashCode() {
		return mId;

packages/SystemUI/src/com/android/systemui/statusbar/notification/dagger/NotificationsModule.java

+13 −2

Original line number	Diff line number	Diff line
		@@ -45,6 +45,8 @@ import com.android.systemui.statusbar.notification.init.NotificationsController;
		import com.android.systemui.statusbar.notification.init.NotificationsControllerImpl;
		import com.android.systemui.statusbar.notification.init.NotificationsControllerStub;
		import com.android.systemui.statusbar.notification.logging.NotificationLogger;
		import com.android.systemui.statusbar.notification.logging.NotificationPanelLogger;
		import com.android.systemui.statusbar.notification.logging.NotificationPanelLoggerImpl;
		import com.android.systemui.statusbar.notification.row.NotificationBlockingHelperManager;
		import com.android.systemui.statusbar.notification.row.NotificationGutsManager;
		import com.android.systemui.statusbar.phone.NotificationGroupManager;
		@@ -146,13 +148,22 @@ public interface NotificationsModule {
		@UiBackground Executor uiBgExecutor,
		NotificationEntryManager entryManager,
		StatusBarStateController statusBarStateController,
		NotificationLogger.ExpansionStateLogger expansionStateLogger) {
		NotificationLogger.ExpansionStateLogger expansionStateLogger,
		NotificationPanelLogger notificationPanelLogger) {
		return new NotificationLogger(
		notificationListener,
		uiBgExecutor,
		entryManager,
		statusBarStateController,
		expansionStateLogger);
		expansionStateLogger,
		notificationPanelLogger);
		}

		/** Provides an instance of {@link NotificationPanelLogger} */
		@Singleton
		@Provides
		static NotificationPanelLogger provideNotificationPanelLogger() {
		return new NotificationPanelLoggerImpl();
		}

		/** Provides an instance of {@link com.android.internal.logging.UiEventLogger} */

packages/SystemUI/src/com/android/systemui/statusbar/notification/logging/NotificationLogger.java

+6 −1

Original line number	Diff line number	Diff line
		@@ -70,6 +70,7 @@ public class NotificationLogger implements StateListener {
		private final NotificationListenerService mNotificationListener;
		private final Executor mUiBgExecutor;
		private final NotificationEntryManager mEntryManager;
		private final NotificationPanelLogger mNotificationPanelLogger;
		private HeadsUpManager mHeadsUpManager;
		private final ExpansionStateLogger mExpansionStateLogger;

		@@ -198,13 +199,15 @@ public class NotificationLogger implements StateListener {
		@UiBackground Executor uiBgExecutor,
		NotificationEntryManager entryManager,
		StatusBarStateController statusBarStateController,
		ExpansionStateLogger expansionStateLogger) {
		ExpansionStateLogger expansionStateLogger,
		NotificationPanelLogger notificationPanelLogger) {
		mNotificationListener = notificationListener;
		mUiBgExecutor = uiBgExecutor;
		mEntryManager = entryManager;
		mBarService = IStatusBarService.Stub.asInterface(
		ServiceManager.getService(Context.STATUS_BAR_SERVICE));
		mExpansionStateLogger = expansionStateLogger;
		mNotificationPanelLogger = notificationPanelLogger;
		// Not expected to be destroyed, don't need to unsubscribe
		statusBarStateController.addCallback(this);

		@@ -264,6 +267,8 @@ public class NotificationLogger implements StateListener {
		// (Note that in cases where the scroller does emit events, this
		// additional event doesn't break anything.)
		mNotificationLocationsChangedListener.onChildLocationsChanged();
		mNotificationPanelLogger.logPanelShown(mListContainer.hasPulsingNotifications(),
		mEntryManager.getVisibleNotifications());
		}

		private void setDozing(boolean dozing) {

packages/SystemUI/src/com/android/systemui/statusbar/notification/logging/NotificationPanelLogger.java

0 → 100644

+95 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2020 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.systemui.statusbar.notification.logging;

		import android.annotation.Nullable;
		import android.service.notification.StatusBarNotification;

		import com.android.internal.logging.UiEvent;
		import com.android.internal.logging.UiEventLogger;
		import com.android.systemui.statusbar.notification.collection.NotificationEntry;
		import com.android.systemui.statusbar.notification.logging.nano.Notifications;

		import java.util.List;
		/**
		* Statsd logging for notification panel.
		*/
		public interface NotificationPanelLogger {

		/**
		* Log a NOTIFICATION_PANEL_REPORTED statsd event.
		* @param visibleNotifications as provided by NotificationEntryManager.getVisibleNotifications()
		*/
		void logPanelShown(boolean isLockscreen,
		@Nullable List<NotificationEntry> visibleNotifications);

		enum NotificationPanelEvent implements UiEventLogger.UiEventEnum {
		@UiEvent(doc = "Notification panel shown from status bar.")
		NOTIFICATION_PANEL_OPEN_STATUS_BAR(200),
		@UiEvent(doc = "Notification panel shown from lockscreen.")
		NOTIFICATION_PANEL_OPEN_LOCKSCREEN(201);

		private final int mId;
		NotificationPanelEvent(int id) {
		mId = id;
		}
		@Override public int getId() {
		return mId;
		}

		public static NotificationPanelEvent fromLockscreen(boolean isLockscreen) {
		return isLockscreen ? NOTIFICATION_PANEL_OPEN_LOCKSCREEN :
		NOTIFICATION_PANEL_OPEN_STATUS_BAR;
		}
		}

		/**
		* Composes a NotificationsList proto from the list of visible notifications.
		* @param visibleNotifications as provided by NotificationEntryManager.getVisibleNotifications()
		* @return NotificationList proto suitable for SysUiStatsLog.write(NOTIFICATION_PANEL_REPORTED)
		*/
		static Notifications.NotificationList toNotificationProto(
		@Nullable List<NotificationEntry> visibleNotifications) {
		Notifications.NotificationList notificationList = new Notifications.NotificationList();
		if (visibleNotifications == null) {
		return notificationList;
		}
		final Notifications.Notification[] proto_array =
		new Notifications.Notification[visibleNotifications.size()];
		int i = 0;
		for (NotificationEntry ne : visibleNotifications) {
		final StatusBarNotification n = ne.getSbn();
		if (n != null) {
		final Notifications.Notification proto = new Notifications.Notification();
		proto.uid = n.getUid();
		proto.packageName = n.getPackageName();
		if (n.getInstanceId() != null) {
		proto.instanceId = n.getInstanceId().getId();
		}
		// TODO set np.groupInstanceId
		if (n.getNotification() != null) {
		proto.isGroupSummary = n.getNotification().isGroupSummary();
		}
		proto.section = 1 + ne.getBucket(); // We want 0 to mean not set / unknown
		proto_array[i] = proto;
		}
		++i;
		}
		notificationList.notifications = proto_array;
		return notificationList;
		}
		}