Merge "implement assistant service connection" (29b7dd8d) · Commits · e / os / android_frameworks_base

Android.mk

+0 −1

Original line number	Diff line number	Diff line
		@@ -226,7 +226,6 @@ LOCAL_SRC_FILES += \
		core/java/android/service/carrier/ICarrierMessagingService.aidl \
		core/java/android/service/gatekeeper/IGateKeeperService.aidl \
		core/java/android/service/notification/INotificationListener.aidl \
		core/java/android/service/notification/INotificationAssistant.aidl \
		core/java/android/service/notification/IStatusBarNotificationHolder.aidl \
		core/java/android/service/notification/IConditionListener.aidl \
		core/java/android/service/notification/IConditionProvider.aidl \

api/current.txt

+6 −9

Original line number	Diff line number	Diff line
		@@ -33494,20 +33494,13 @@ package android.service.notification {
		field public static final java.lang.String SERVICE_INTERFACE = "android.service.notification.ConditionProviderService";
		}

		public class NotificationAdjustment implements android.os.Parcelable {
		ctor public NotificationAdjustment(int, java.lang.CharSequence, android.net.Uri);
		method public int describeContents();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.service.notification.NotificationAdjustment> CREATOR;
		}

		public abstract class NotificationAssistantService extends android.service.notification.NotificationListenerService {
		ctor public NotificationAssistantService();
		method public final void adjustImportance(java.lang.String, android.service.notification.NotificationAdjustment);
		method public final void adjustImportance(java.lang.String, android.service.notification.NotificationAssistantService.Adjustment);
		method public final void clearAnnotation(java.lang.String);
		method public void onNotificationActionClick(java.lang.String, long, int);
		method public void onNotificationClick(java.lang.String, long);
		method public abstract android.service.notification.NotificationAdjustment onNotificationEnqueued(android.service.notification.StatusBarNotification, int, boolean);
		method public abstract android.service.notification.NotificationAssistantService.Adjustment onNotificationEnqueued(android.service.notification.StatusBarNotification, int, boolean);
		method public void onNotificationRemoved(java.lang.String, long, int);
		method public void onNotificationVisibilityChanged(java.lang.String, long, boolean);
		method public final void setAnnotation(java.lang.String, android.app.Notification);
		@@ -33527,6 +33520,10 @@ package android.service.notification {
		field public static final java.lang.String SERVICE_INTERFACE = "android.service.notification.NotificationAssistantService";
		}

		public class NotificationAssistantService.Adjustment {
		ctor public NotificationAssistantService.Adjustment(int, java.lang.CharSequence, android.net.Uri);
		}

		public abstract class NotificationListenerService extends android.app.Service {
		ctor public NotificationListenerService();
		method public final void cancelAllNotifications();

api/system-current.txt

+6 −9

Original line number	Diff line number	Diff line
		@@ -35636,20 +35636,13 @@ package android.service.notification {
		field public static final java.lang.String SERVICE_INTERFACE = "android.service.notification.ConditionProviderService";
		}

		public class NotificationAdjustment implements android.os.Parcelable {
		ctor public NotificationAdjustment(int, java.lang.CharSequence, android.net.Uri);
		method public int describeContents();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.service.notification.NotificationAdjustment> CREATOR;
		}

		public abstract class NotificationAssistantService extends android.service.notification.NotificationListenerService {
		ctor public NotificationAssistantService();
		method public final void adjustImportance(java.lang.String, android.service.notification.NotificationAdjustment);
		method public final void adjustImportance(java.lang.String, android.service.notification.NotificationAssistantService.Adjustment);
		method public final void clearAnnotation(java.lang.String);
		method public void onNotificationActionClick(java.lang.String, long, int);
		method public void onNotificationClick(java.lang.String, long);
		method public abstract android.service.notification.NotificationAdjustment onNotificationEnqueued(android.service.notification.StatusBarNotification, int, boolean);
		method public abstract android.service.notification.NotificationAssistantService.Adjustment onNotificationEnqueued(android.service.notification.StatusBarNotification, int, boolean);
		method public void onNotificationRemoved(java.lang.String, long, int);
		method public void onNotificationVisibilityChanged(java.lang.String, long, boolean);
		method public final void setAnnotation(java.lang.String, android.app.Notification);
		@@ -35669,6 +35662,10 @@ package android.service.notification {
		field public static final java.lang.String SERVICE_INTERFACE = "android.service.notification.NotificationAssistantService";
		}

		public class NotificationAssistantService.Adjustment {
		ctor public NotificationAssistantService.Adjustment(int, java.lang.CharSequence, android.net.Uri);
		}

		public abstract class NotificationListenerService extends android.app.Service {
		ctor public NotificationListenerService();
		method public final void cancelAllNotifications();

api/test-current.txt

+6 −9

Original line number	Diff line number	Diff line
		@@ -33497,20 +33497,13 @@ package android.service.notification {
		field public static final java.lang.String SERVICE_INTERFACE = "android.service.notification.ConditionProviderService";
		}

		public class NotificationAdjustment implements android.os.Parcelable {
		ctor public NotificationAdjustment(int, java.lang.CharSequence, android.net.Uri);
		method public int describeContents();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.service.notification.NotificationAdjustment> CREATOR;
		}

		public abstract class NotificationAssistantService extends android.service.notification.NotificationListenerService {
		ctor public NotificationAssistantService();
		method public final void adjustImportance(java.lang.String, android.service.notification.NotificationAdjustment);
		method public final void adjustImportance(java.lang.String, android.service.notification.NotificationAssistantService.Adjustment);
		method public final void clearAnnotation(java.lang.String);
		method public void onNotificationActionClick(java.lang.String, long, int);
		method public void onNotificationClick(java.lang.String, long);
		method public abstract android.service.notification.NotificationAdjustment onNotificationEnqueued(android.service.notification.StatusBarNotification, int, boolean);
		method public abstract android.service.notification.NotificationAssistantService.Adjustment onNotificationEnqueued(android.service.notification.StatusBarNotification, int, boolean);
		method public void onNotificationRemoved(java.lang.String, long, int);
		method public void onNotificationVisibilityChanged(java.lang.String, long, boolean);
		method public final void setAnnotation(java.lang.String, android.app.Notification);
		@@ -33530,6 +33523,10 @@ package android.service.notification {
		field public static final java.lang.String SERVICE_INTERFACE = "android.service.notification.NotificationAssistantService";
		}

		public class NotificationAssistantService.Adjustment {
		ctor public NotificationAssistantService.Adjustment(int, java.lang.CharSequence, android.net.Uri);
		}

		public abstract class NotificationListenerService extends android.app.Service {
		ctor public NotificationListenerService();
		method public final void cancelAllNotifications();

core/java/android/app/INotificationManager.aidl

+2 −0

Original line number	Diff line number	Diff line
		@@ -78,6 +78,8 @@ interface INotificationManager
		void setOnNotificationPostedTrimFromListener(in INotificationListener token, int trim);
		void setInterruptionFilter(String pkg, int interruptionFilter);

		void setImportanceFromAssistant(in INotificationListener token, String key, int importance, CharSequence explanation);

		ComponentName getEffectsSuppressor();
		boolean matchesCallFilter(in Bundle extras);
		boolean isSystemConditionProviderEnabled(String path);