From ceecfcf5ccd4790f9ab3a08c3cb7ce4baa2c1eb1 Mon Sep 17 00:00:00 2001 From: Julia Reynolds Date: Tue, 31 Jan 2017 09:44:26 -0500 Subject: [PATCH] Remove unneeded parameters Test: cts-verifier Change-Id: Ifaddd71aa44898c7c16f28f1715fd035861e3be6 --- api/current.txt | 2 +- api/system-current.txt | 2 +- api/test-current.txt | 2 +- .../notification/INotificationListener.aidl | 2 +- .../notification/NotificationAssistantService.java | 14 +++----------- .../notification/NotificationListenerService.java | 4 ++-- .../notification/NotificationManagerService.java | 6 +++--- 7 files changed, 12 insertions(+), 20 deletions(-) diff --git a/api/current.txt b/api/current.txt index 415ce7c85a0d6..2be6183f7923b 100644 --- a/api/current.txt +++ b/api/current.txt @@ -36124,7 +36124,7 @@ package android.service.notification { method public void deleteNotificationChannel(java.lang.String, java.lang.String); method public java.util.List getNotificationChannels(java.lang.String); method public final android.os.IBinder onBind(android.content.Intent); - method public abstract android.service.notification.Adjustment onNotificationEnqueued(android.service.notification.StatusBarNotification, int, boolean); + method public abstract android.service.notification.Adjustment onNotificationEnqueued(android.service.notification.StatusBarNotification); method public abstract void onNotificationSnoozedUntilContext(android.service.notification.StatusBarNotification, java.lang.String); method public final void unsnoozeNotification(java.lang.String); method public void updateNotificationChannel(java.lang.String, android.app.NotificationChannel); diff --git a/api/system-current.txt b/api/system-current.txt index 4c194d762e54a..bc08f70536f29 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -39152,7 +39152,7 @@ package android.service.notification { method public void deleteNotificationChannel(java.lang.String, java.lang.String); method public java.util.List getNotificationChannels(java.lang.String); method public final android.os.IBinder onBind(android.content.Intent); - method public abstract android.service.notification.Adjustment onNotificationEnqueued(android.service.notification.StatusBarNotification, int, boolean); + method public abstract android.service.notification.Adjustment onNotificationEnqueued(android.service.notification.StatusBarNotification); method public abstract void onNotificationSnoozedUntilContext(android.service.notification.StatusBarNotification, java.lang.String); method public final void unsnoozeNotification(java.lang.String); method public void updateNotificationChannel(java.lang.String, android.app.NotificationChannel); diff --git a/api/test-current.txt b/api/test-current.txt index 244bee3fce395..37505f5928afc 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -36259,7 +36259,7 @@ package android.service.notification { method public void deleteNotificationChannel(java.lang.String, java.lang.String); method public java.util.List getNotificationChannels(java.lang.String); method public final android.os.IBinder onBind(android.content.Intent); - method public abstract android.service.notification.Adjustment onNotificationEnqueued(android.service.notification.StatusBarNotification, int, boolean); + method public abstract android.service.notification.Adjustment onNotificationEnqueued(android.service.notification.StatusBarNotification); method public abstract void onNotificationSnoozedUntilContext(android.service.notification.StatusBarNotification, java.lang.String); method public final void unsnoozeNotification(java.lang.String); method public void updateNotificationChannel(java.lang.String, android.app.NotificationChannel); diff --git a/core/java/android/service/notification/INotificationListener.aidl b/core/java/android/service/notification/INotificationListener.aidl index 01d3391d32af8..b26e32835aa1b 100644 --- a/core/java/android/service/notification/INotificationListener.aidl +++ b/core/java/android/service/notification/INotificationListener.aidl @@ -34,6 +34,6 @@ oneway interface INotificationListener void onInterruptionFilterChanged(int interruptionFilter); // rankers only - void onNotificationEnqueued(in IStatusBarNotificationHolder notificationHolder, int importance, boolean user); + void onNotificationEnqueued(in IStatusBarNotificationHolder notificationHolder); void onNotificationSnoozedUntilContext(in IStatusBarNotificationHolder notificationHolder, String snoozeCriterionId); } diff --git a/core/java/android/service/notification/NotificationAssistantService.java b/core/java/android/service/notification/NotificationAssistantService.java index cecdbee75b00d..de86b2d2b6edc 100644 --- a/core/java/android/service/notification/NotificationAssistantService.java +++ b/core/java/android/service/notification/NotificationAssistantService.java @@ -77,12 +77,9 @@ public abstract class NotificationAssistantService extends NotificationListenerS * A notification was posted by an app. Called before alert. * * @param sbn the new notification - * @param importance the initial importance of the notification. - * @param user true if the initial importance reflects an explicit user preference. * @return an adjustment or null to take no action, within 100ms. */ - abstract public Adjustment onNotificationEnqueued(StatusBarNotification sbn, - int importance, boolean user); + abstract public Adjustment onNotificationEnqueued(StatusBarNotification sbn); /** * Updates a notification. N.B. this won’t cause @@ -202,8 +199,7 @@ public abstract class NotificationAssistantService extends NotificationListenerS private class NotificationAssistantServiceWrapper extends NotificationListenerWrapper { @Override - public void onNotificationEnqueued(IStatusBarNotificationHolder sbnHolder, - int importance, boolean user) { + public void onNotificationEnqueued(IStatusBarNotificationHolder sbnHolder) { StatusBarNotification sbn; try { sbn = sbnHolder.get(); @@ -214,8 +210,6 @@ public abstract class NotificationAssistantService extends NotificationListenerS SomeArgs args = SomeArgs.obtain(); args.arg1 = sbn; - args.argi1 = importance; - args.argi2 = user ? 1 : 0; mHandler.obtainMessage(MyHandler.MSG_ON_NOTIFICATION_ENQUEUED, args).sendToTarget(); } @@ -254,10 +248,8 @@ public abstract class NotificationAssistantService extends NotificationListenerS case MSG_ON_NOTIFICATION_ENQUEUED: { SomeArgs args = (SomeArgs) msg.obj; StatusBarNotification sbn = (StatusBarNotification) args.arg1; - final int importance = args.argi1; - final boolean user = args.argi2 == 1; args.recycle(); - Adjustment adjustment = onNotificationEnqueued(sbn, importance, user); + Adjustment adjustment = onNotificationEnqueued(sbn); if (adjustment != null) { if (!isBound()) return; try { diff --git a/core/java/android/service/notification/NotificationListenerService.java b/core/java/android/service/notification/NotificationListenerService.java index 22ad83acf6848..e5abdac9e8604 100644 --- a/core/java/android/service/notification/NotificationListenerService.java +++ b/core/java/android/service/notification/NotificationListenerService.java @@ -1100,8 +1100,8 @@ public abstract class NotificationListenerService extends Service { } @Override - public void onNotificationEnqueued(IStatusBarNotificationHolder notificationHolder, - int importance, boolean user) throws RemoteException { + public void onNotificationEnqueued(IStatusBarNotificationHolder notificationHolder) + throws RemoteException { // no-op in the listener } diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index b82999ec99b19..a83597672cc96 100644 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -4559,18 +4559,18 @@ public class NotificationManagerService extends SystemService { mHandler.post(new Runnable() { @Override public void run() { - notifyEnqueued(info, sbnToPost, importance, fromUser); + notifyEnqueued(info, sbnToPost); } }); } } private void notifyEnqueued(final ManagedServiceInfo info, - final StatusBarNotification sbn, int importance, boolean fromUser) { + final StatusBarNotification sbn) { final INotificationListener assistant = (INotificationListener) info.service; StatusBarNotificationHolder sbnHolder = new StatusBarNotificationHolder(sbn); try { - assistant.onNotificationEnqueued(sbnHolder, importance, fromUser); + assistant.onNotificationEnqueued(sbnHolder); } catch (RemoteException ex) { Log.e(TAG, "unable to notify assistant (enqueued): " + assistant, ex); }