Merge "Replace @UiThread by @MainThread in NotificationListenerService" into main (01905a83) · Commits · e / os / android_frameworks_base

core/api/current.txt

+13 −13

Original line number	Diff line number	Diff line
		@@ -42637,19 +42637,19 @@ package android.service.notification {
		method public final android.service.notification.StatusBarNotification[] getSnoozedNotifications();
		method public final void migrateNotificationFilter(int, @Nullable java.util.List<java.lang.String>);
		method public android.os.IBinder onBind(android.content.Intent);
		method @UiThread public void onInterruptionFilterChanged(int);
		method @UiThread public void onListenerConnected();
		method @UiThread public void onListenerDisconnected();
		method @UiThread public void onListenerHintsChanged(int);
		method @UiThread public void onNotificationChannelGroupModified(String, android.os.UserHandle, android.app.NotificationChannelGroup, int);
		method @UiThread public void onNotificationChannelModified(String, android.os.UserHandle, android.app.NotificationChannel, int);
		method @UiThread public void onNotificationPosted(android.service.notification.StatusBarNotification);
		method @UiThread public void onNotificationPosted(android.service.notification.StatusBarNotification, android.service.notification.NotificationListenerService.RankingMap);
		method @UiThread public void onNotificationRankingUpdate(android.service.notification.NotificationListenerService.RankingMap);
		method @UiThread public void onNotificationRemoved(android.service.notification.StatusBarNotification);
		method @UiThread public void onNotificationRemoved(android.service.notification.StatusBarNotification, android.service.notification.NotificationListenerService.RankingMap);
		method @UiThread public void onNotificationRemoved(android.service.notification.StatusBarNotification, android.service.notification.NotificationListenerService.RankingMap, int);
		method @UiThread public void onSilentStatusBarIconsVisibilityChanged(boolean);
		method @MainThread public void onInterruptionFilterChanged(int);
		method @MainThread public void onListenerConnected();
		method @MainThread public void onListenerDisconnected();
		method @MainThread public void onListenerHintsChanged(int);
		method @MainThread public void onNotificationChannelGroupModified(String, android.os.UserHandle, android.app.NotificationChannelGroup, int);
		method @MainThread public void onNotificationChannelModified(String, android.os.UserHandle, android.app.NotificationChannel, int);
		method @MainThread public void onNotificationPosted(android.service.notification.StatusBarNotification);
		method @MainThread public void onNotificationPosted(android.service.notification.StatusBarNotification, android.service.notification.NotificationListenerService.RankingMap);
		method @MainThread public void onNotificationRankingUpdate(android.service.notification.NotificationListenerService.RankingMap);
		method @MainThread public void onNotificationRemoved(android.service.notification.StatusBarNotification);
		method @MainThread public void onNotificationRemoved(android.service.notification.StatusBarNotification, android.service.notification.NotificationListenerService.RankingMap);
		method @MainThread public void onNotificationRemoved(android.service.notification.StatusBarNotification, android.service.notification.NotificationListenerService.RankingMap, int);
		method @MainThread public void onSilentStatusBarIconsVisibilityChanged(boolean);
		method public final void requestInterruptionFilter(int);
		method public final void requestListenerHints(int);
		method public static void requestRebind(android.content.ComponentName);

core/api/system-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -13817,7 +13817,7 @@ package android.service.notification {
		}

		public abstract class NotificationListenerService extends android.app.Service {
		method @UiThread public void onNotificationRemoved(@NonNull android.service.notification.StatusBarNotification, @NonNull android.service.notification.NotificationListenerService.RankingMap, @NonNull android.service.notification.NotificationStats, int);
		method @MainThread public void onNotificationRemoved(@NonNull android.service.notification.StatusBarNotification, @NonNull android.service.notification.NotificationListenerService.RankingMap, @NonNull android.service.notification.NotificationStats, int);
		}

		public static class NotificationListenerService.Ranking {

core/java/android/service/notification/NotificationListenerService.java

+15 −15

Original line number	Diff line number	Diff line
		@@ -19,11 +19,11 @@ package android.service.notification;
		import android.annotation.CurrentTimeMillisLong;
		import android.annotation.FlaggedApi;
		import android.annotation.IntDef;
		import android.annotation.MainThread;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SdkConstant;
		import android.annotation.SystemApi;
		import android.annotation.UiThread;
		import android.app.ActivityManager;
		import android.app.INotificationManager;
		import android.app.Notification;
		@@ -491,7 +491,7 @@ public abstract class NotificationListenerService extends Service {
		* object as well as its identifying information (tag and id) and source
		* (package name).
		*/
		@UiThread
		@MainThread
		public void onNotificationPosted(StatusBarNotification sbn) {
		// optional
		}
		@@ -505,7 +505,7 @@ public abstract class NotificationListenerService extends Service {
		* @param rankingMap The current ranking map that can be used to retrieve ranking information
		* for active notifications, including the newly posted one.
		*/
		@UiThread
		@MainThread
		public void onNotificationPosted(StatusBarNotification sbn, RankingMap rankingMap) {
		onNotificationPosted(sbn);
		}
		@@ -524,7 +524,7 @@ public abstract class NotificationListenerService extends Service {
		* and source (package name) used to post the {@link android.app.Notification} that
		* was just removed.
		*/
		@UiThread
		@MainThread
		public void onNotificationRemoved(StatusBarNotification sbn) {
		// optional
		}
		@@ -546,7 +546,7 @@ public abstract class NotificationListenerService extends Service {
		* for active notifications.
		*
		*/
		@UiThread
		@MainThread
		public void onNotificationRemoved(StatusBarNotification sbn, RankingMap rankingMap) {
		onNotificationRemoved(sbn);
		}
		@@ -568,7 +568,7 @@ public abstract class NotificationListenerService extends Service {
		* @param rankingMap The current ranking map that can be used to retrieve ranking information
		* for active notifications.
		*/
		@UiThread
		@MainThread
		public void onNotificationRemoved(StatusBarNotification sbn, RankingMap rankingMap,
		@NotificationCancelReason int reason) {
		onNotificationRemoved(sbn, rankingMap);
		@@ -580,7 +580,7 @@ public abstract class NotificationListenerService extends Service {
		*
		* @hide
		*/
		@UiThread
		@MainThread
		@SystemApi
		public void onNotificationRemoved(@NonNull StatusBarNotification sbn,
		@NonNull RankingMap rankingMap, @NonNull NotificationStats stats, int reason) {
		@@ -592,7 +592,7 @@ public abstract class NotificationListenerService extends Service {
		* the notification manager. You are safe to call {@link #getActiveNotifications()}
		* at this time.
		*/
		@UiThread
		@MainThread
		public void onListenerConnected() {
		// optional
		}
		@@ -602,7 +602,7 @@ public abstract class NotificationListenerService extends Service {
		* notification manager.You will not receive any events after this call, and may only
		* call {@link #requestRebind(ComponentName)} at this time.
		*/
		@UiThread
		@MainThread
		public void onListenerDisconnected() {
		// optional
		}
		@@ -613,7 +613,7 @@ public abstract class NotificationListenerService extends Service {
		* @param rankingMap The current ranking map that can be used to retrieve ranking information
		* for active notifications.
		*/
		@UiThread
		@MainThread
		public void onNotificationRankingUpdate(RankingMap rankingMap) {
		// optional
		}
		@@ -624,7 +624,7 @@ public abstract class NotificationListenerService extends Service {
		*
		* @param hints The current {@link #getCurrentListenerHints() listener hints}.
		*/
		@UiThread
		@MainThread
		public void onListenerHintsChanged(int hints) {
		// optional
		}
		@@ -636,7 +636,7 @@ public abstract class NotificationListenerService extends Service {
		* @param hideSilentStatusIcons whether or not status bar icons should be hidden for silent
		* notifications
		*/
		@UiThread
		@MainThread
		public void onSilentStatusBarIconsVisibilityChanged(boolean hideSilentStatusIcons) {
		// optional
		}
		@@ -654,7 +654,7 @@ public abstract class NotificationListenerService extends Service {
		* {@link #NOTIFICATION_CHANNEL_OR_GROUP_UPDATED},
		* {@link #NOTIFICATION_CHANNEL_OR_GROUP_DELETED}.
		*/
		@UiThread
		@MainThread
		public void onNotificationChannelModified(String pkg, UserHandle user,
		NotificationChannel channel, @ChannelOrGroupModificationTypes int modificationType) {
		// optional
		@@ -673,7 +673,7 @@ public abstract class NotificationListenerService extends Service {
		* {@link #NOTIFICATION_CHANNEL_OR_GROUP_UPDATED},
		* {@link #NOTIFICATION_CHANNEL_OR_GROUP_DELETED}.
		*/
		@UiThread
		@MainThread
		public void onNotificationChannelGroupModified(String pkg, UserHandle user,
		NotificationChannelGroup group, @ChannelOrGroupModificationTypes int modificationType) {
		// optional
		@@ -686,7 +686,7 @@ public abstract class NotificationListenerService extends Service {
		* @param interruptionFilter The current
		* {@link #getCurrentInterruptionFilter() interruption filter}.
		*/
		@UiThread
		@MainThread
		public void onInterruptionFilterChanged(int interruptionFilter) {
		// optional
		}