Merge "Merge "Rename capabilities to adjustments" into qt-dev am: e8c5311cb0 am: 1276a2f4f3" (c28d2f5f) · Commits · e / os / android_frameworks_base

api/system-current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -553,7 +553,7 @@ package android.app {
		}

		public class NotificationManager {
		method @NonNull public java.util.List<java.lang.String> getAllowedAssistantCapabilities();
		method @NonNull public java.util.List<java.lang.String> getAllowedAssistantAdjustments();
		method @Nullable public android.content.ComponentName getAllowedNotificationAssistant();
		method public boolean isNotificationAssistantAccessGranted(@NonNull android.content.ComponentName);
		method public void setNotificationAssistantAccessGranted(@Nullable android.content.ComponentName, boolean);
		@@ -6631,8 +6631,8 @@ package android.service.notification {
		method public final void adjustNotification(@NonNull android.service.notification.Adjustment);
		method public final void adjustNotifications(@NonNull java.util.List<android.service.notification.Adjustment>);
		method public void onActionInvoked(@NonNull String, @NonNull android.app.Notification.Action, int);
		method public void onAllowedAdjustmentsChanged();
		method @NonNull public final android.os.IBinder onBind(@Nullable android.content.Intent);
		method public void onCapabilitiesChanged();
		method public void onNotificationDirectReplied(@NonNull String);
		method @Nullable public abstract android.service.notification.Adjustment onNotificationEnqueued(@NonNull android.service.notification.StatusBarNotification);
		method @Nullable public android.service.notification.Adjustment onNotificationEnqueued(@NonNull android.service.notification.StatusBarNotification, @NonNull android.app.NotificationChannel);

api/test-current.txt

+4 −4

Original line number	Diff line number	Diff line
		@@ -328,9 +328,9 @@ package android.app {
		}

		public class NotificationManager {
		method public void allowAssistantCapability(String);
		method public void disallowAssistantCapability(String);
		method @NonNull public java.util.List<java.lang.String> getAllowedAssistantCapabilities();
		method public void allowAssistantAdjustment(String);
		method public void disallowAssistantAdjustment(String);
		method @NonNull public java.util.List<java.lang.String> getAllowedAssistantAdjustments();
		method @Nullable public android.content.ComponentName getAllowedNotificationAssistant();
		method public android.content.ComponentName getEffectsSuppressor();
		method public boolean isNotificationAssistantAccessGranted(@NonNull android.content.ComponentName);
		@@ -2489,8 +2489,8 @@ package android.service.notification {
		method public final void adjustNotification(@NonNull android.service.notification.Adjustment);
		method public final void adjustNotifications(@NonNull java.util.List<android.service.notification.Adjustment>);
		method public void onActionInvoked(@NonNull String, @NonNull android.app.Notification.Action, int);
		method public void onAllowedAdjustmentsChanged();
		method @NonNull public final android.os.IBinder onBind(@Nullable android.content.Intent);
		method public void onCapabilitiesChanged();
		method public void onNotificationDirectReplied(@NonNull String);
		method @Nullable public abstract android.service.notification.Adjustment onNotificationEnqueued(@NonNull android.service.notification.StatusBarNotification);
		method @Nullable public android.service.notification.Adjustment onNotificationEnqueued(@NonNull android.service.notification.StatusBarNotification, @NonNull android.app.NotificationChannel);

core/java/android/app/INotificationManager.aidl

+3 −3

Original line number	Diff line number	Diff line
		@@ -70,9 +70,9 @@ interface INotificationManager
		boolean areNotificationsEnabled(String pkg);
		int getPackageImportance(String pkg);

		List<String> getAllowedAssistantCapabilities(String pkg);
		void allowAssistantCapability(String adjustmentType);
		void disallowAssistantCapability(String adjustmentType);
		List<String> getAllowedAssistantAdjustments(String pkg);
		void allowAssistantAdjustment(String adjustmentType);
		void disallowAssistantAdjustment(String adjustmentType);

		boolean shouldHideSilentStatusIcons(String callingPkg);
		void setHideSilentStatusIcons(boolean hide);

core/java/android/app/NotificationManager.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -1206,10 +1206,10 @@ public class NotificationManager {
		*/
		@SystemApi
		@TestApi
		public @NonNull @Adjustment.Keys List<String> getAllowedAssistantCapabilities() {
		public @NonNull @Adjustment.Keys List<String> getAllowedAssistantAdjustments() {
		INotificationManager service = getService();
		try {
		return service.getAllowedAssistantCapabilities(mContext.getOpPackageName());
		return service.getAllowedAssistantAdjustments(mContext.getOpPackageName());
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		@@ -1219,10 +1219,10 @@ public class NotificationManager {
		* @hide
		*/
		@TestApi
		public void allowAssistantCapability(String capability) {
		public void allowAssistantAdjustment(String capability) {
		INotificationManager service = getService();
		try {
		service.allowAssistantCapability(capability);
		service.allowAssistantAdjustment(capability);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		@@ -1232,10 +1232,10 @@ public class NotificationManager {
		* @hide
		*/
		@TestApi
		public void disallowAssistantCapability(String capability) {
		public void disallowAssistantAdjustment(String capability) {
		INotificationManager service = getService();
		try {
		service.disallowAssistantCapability(capability);
		service.disallowAssistantAdjustment(capability);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}

core/java/android/service/notification/INotificationListener.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -53,5 +53,5 @@ oneway interface INotificationListener
		void onNotificationDirectReply(String key);
		void onSuggestedReplySent(String key, in CharSequence reply, int source);
		void onActionClicked(String key, in Notification.Action action, int source);
		void onCapabilitiesChanged();
		void onAllowedAdjustmentsChanged();
		}