Merge "Adjust testapis/permissions for CTS tests" into qt-dev (a2c50b1d) · Commits · e / os / android_frameworks_base

api/test-current.txt

+45 −0

Original line number	Diff line number	Diff line
		@@ -328,8 +328,14 @@ 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 @Nullable public android.content.ComponentName getAllowedNotificationAssistant();
		method public android.content.ComponentName getEffectsSuppressor();
		method public boolean isNotificationAssistantAccessGranted(@NonNull android.content.ComponentName);
		method public boolean matchesCallFilter(android.os.Bundle);
		method public void setNotificationAssistantAccessGranted(@Nullable android.content.ComponentName, boolean);
		}

		public final class PictureInPictureParams implements android.os.Parcelable {
		@@ -2454,10 +2460,49 @@ package android.service.contentcapture {

		package android.service.notification {

		public final class Adjustment implements android.os.Parcelable {
		ctor public Adjustment(String, String, android.os.Bundle, CharSequence, int);
		ctor public Adjustment(@NonNull String, @NonNull String, @NonNull android.os.Bundle, @NonNull CharSequence, @NonNull android.os.UserHandle);
		method public int describeContents();
		method @NonNull public CharSequence getExplanation();
		method @NonNull public String getKey();
		method @NonNull public String getPackage();
		method @NonNull public android.os.Bundle getSignals();
		method public int getUser();
		method @NonNull public android.os.UserHandle getUserHandle();
		method public void writeToParcel(android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.service.notification.Adjustment> CREATOR;
		field public static final String KEY_CONTEXTUAL_ACTIONS = "key_contextual_actions";
		field public static final String KEY_IMPORTANCE = "key_importance";
		field public static final String KEY_SNOOZE_CRITERIA = "key_snooze_criteria";
		field public static final String KEY_TEXT_REPLIES = "key_text_replies";
		field public static final String KEY_USER_SENTIMENT = "key_user_sentiment";
		}

		@Deprecated public abstract class ConditionProviderService extends android.app.Service {
		method @Deprecated public boolean isBound();
		}

		public abstract class NotificationAssistantService extends android.service.notification.NotificationListenerService {
		ctor public NotificationAssistantService();
		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 @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);
		method public void onNotificationExpansionChanged(@NonNull String, boolean, boolean);
		method public abstract void onNotificationSnoozedUntilContext(@NonNull android.service.notification.StatusBarNotification, @NonNull String);
		method public void onNotificationsSeen(@NonNull java.util.List<java.lang.String>);
		method public void onSuggestedReplySent(@NonNull String, @NonNull CharSequence, int);
		method public final void unsnoozeNotification(@NonNull String);
		field public static final String SERVICE_INTERFACE = "android.service.notification.NotificationAssistantService";
		field public static final int SOURCE_FROM_APP = 0; // 0x0
		field public static final int SOURCE_FROM_ASSISTANT = 1; // 0x1
		}

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

core/java/android/app/NotificationManager.java

+30 −0

Original line number	Diff line number	Diff line
		@@ -1169,6 +1169,7 @@ public class NotificationManager {
		* @hide
		*/
		@SystemApi
		@TestApi
		public boolean isNotificationAssistantAccessGranted(@NonNull ComponentName assistant) {
		INotificationManager service = getService();
		try {
		@@ -1204,6 +1205,7 @@ public class NotificationManager {
		* @hide
		*/
		@SystemApi
		@TestApi
		public @NonNull @Adjustment.Keys List<String> getAllowedAssistantCapabilities() {
		INotificationManager service = getService();
		try {
		@@ -1213,6 +1215,32 @@ public class NotificationManager {
		}
		}

		/**
		* @hide
		*/
		@TestApi
		public void allowAssistantCapability(String capability) {
		INotificationManager service = getService();
		try {
		service.allowAssistantCapability(capability);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}

		/**
		* @hide
		*/
		@TestApi
		public void disallowAssistantCapability(String capability) {
		INotificationManager service = getService();
		try {
		service.disallowAssistantCapability(capability);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}

		/** @hide */
		public boolean isNotificationPolicyAccessGrantedForPackage(String pkg) {
		INotificationManager service = getService();
		@@ -1310,6 +1338,7 @@ public class NotificationManager {
		* @hide
		*/
		@SystemApi
		@TestApi
		public void setNotificationAssistantAccessGranted(@Nullable ComponentName assistant,
		boolean granted) {
		INotificationManager service = getService();
		@@ -1332,6 +1361,7 @@ public class NotificationManager {

		/** @hide */
		@SystemApi
		@TestApi
		public @Nullable ComponentName getAllowedNotificationAssistant() {
		INotificationManager service = getService();
		try {

core/java/android/service/notification/Adjustment.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package android.service.notification;
		import android.annotation.NonNull;
		import android.annotation.StringDef;
		import android.annotation.SystemApi;
		import android.annotation.TestApi;
		import android.app.Notification;
		import android.os.Bundle;
		import android.os.Parcel;
		@@ -40,6 +41,7 @@ import java.lang.annotation.RetentionPolicy;
		* @hide
		*/
		@SystemApi
		@TestApi
		public final class Adjustment implements Parcelable {
		private final String mPackage;
		private final String mKey;
		@@ -130,6 +132,7 @@ public final class Adjustment implements Parcelable {
		* @hide
		*/
		@SystemApi
		@TestApi
		public Adjustment(String pkg, String key, Bundle signals, CharSequence explanation, int user) {
		mPackage = pkg;
		mKey = key;
		@@ -212,6 +215,7 @@ public final class Adjustment implements Parcelable {

		/** @hide */
		@SystemApi
		@TestApi
		public int getUser() {
		return mUser;
		}

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -53,4 +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();
		}

core/java/android/service/notification/NotificationAssistantService.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SdkConstant;
		import android.annotation.SystemApi;
		import android.annotation.TestApi;
		import android.app.Notification;
		import android.app.NotificationChannel;
		import android.app.NotificationManager;
		@@ -65,6 +66,7 @@ import java.util.List;
		* @hide
		*/
		@SystemApi
		@TestApi
		public abstract class NotificationAssistantService extends NotificationListenerService {
		private static final String TAG = "NotificationAssistants";

		@@ -357,6 +359,11 @@ public abstract class NotificationAssistantService extends NotificationListenerS
		args.argi2 = source;
		mHandler.obtainMessage(MyHandler.MSG_ON_ACTION_INVOKED, args).sendToTarget();
		}

		@Override
		public void onCapabilitiesChanged() {
		mHandler.obtainMessage(MyHandler.MSG_ON_CAPABILITIES_CHANGED).sendToTarget();
		}
		}

		private final class MyHandler extends Handler {
		@@ -367,6 +374,7 @@ public abstract class NotificationAssistantService extends NotificationListenerS
		public static final int MSG_ON_NOTIFICATION_DIRECT_REPLY_SENT = 5;
		public static final int MSG_ON_SUGGESTED_REPLY_SENT = 6;
		public static final int MSG_ON_ACTION_INVOKED = 7;
		public static final int MSG_ON_CAPABILITIES_CHANGED = 8;

		public MyHandler(Looper looper) {
		super(looper, null, false);
		@@ -448,6 +456,10 @@ public abstract class NotificationAssistantService extends NotificationListenerS
		onActionInvoked(key, action, source);
		break;
		}
		case MSG_ON_CAPABILITIES_CHANGED: {
		onCapabilitiesChanged();
		break;
		}
		}
		}
		}