diff options
Diffstat (limited to 'core/java/android')
5 files changed, 10 insertions, 25 deletions
diff --git a/core/java/android/app/NotificationManager.java b/core/java/android/app/NotificationManager.java index 43614feb28a4..c4b4b4070ce7 100644 --- a/core/java/android/app/NotificationManager.java +++ b/core/java/android/app/NotificationManager.java @@ -1137,9 +1137,6 @@ public class NotificationManager { } } - /** - * @hide - */ public boolean isNotificationAssistantAccessGranted(ComponentName assistant) { INotificationManager service = getService(); try { diff --git a/core/java/android/service/notification/Adjustment.java b/core/java/android/service/notification/Adjustment.java index de532b74375f..b6788f578bd6 100644 --- a/core/java/android/service/notification/Adjustment.java +++ b/core/java/android/service/notification/Adjustment.java @@ -15,8 +15,6 @@ */ package android.service.notification; -import android.annotation.SystemApi; -import android.annotation.TestApi; import android.app.Notification; import android.os.Bundle; import android.os.Parcel; @@ -24,10 +22,7 @@ import android.os.Parcelable; /** * Ranking updates from the Assistant. - * @hide */ -@SystemApi -@TestApi public final class Adjustment implements Parcelable { private final String mPackage; private final String mKey; @@ -39,6 +34,7 @@ public final class Adjustment implements Parcelable { * Data type: ArrayList of {@code String}, where each is a representation of a * {@link android.provider.ContactsContract.Contacts#CONTENT_LOOKUP_URI}. * See {@link android.app.Notification.Builder#addPerson(String)}. + * @hide */ public static final String KEY_PEOPLE = "key_people"; /** @@ -46,6 +42,7 @@ public final class Adjustment implements Parcelable { * users. If a user chooses to snooze a notification until one of these criterion, the * assistant will be notified via * {@link NotificationAssistantService#onNotificationSnoozedUntilContext}. + * @hide */ public static final String KEY_SNOOZE_CRITERIA = "key_snooze_criteria"; /** @@ -112,7 +109,7 @@ public final class Adjustment implements Parcelable { mUser = user; } - protected Adjustment(Parcel in) { + private Adjustment(Parcel in) { if (in.readInt() == 1) { mPackage = in.readString(); } else { diff --git a/core/java/android/service/notification/NotificationAssistantService.java b/core/java/android/service/notification/NotificationAssistantService.java index ad34ab3bddb1..e93b1580bc66 100644 --- a/core/java/android/service/notification/NotificationAssistantService.java +++ b/core/java/android/service/notification/NotificationAssistantService.java @@ -21,8 +21,6 @@ import static java.lang.annotation.RetentionPolicy.SOURCE; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.SdkConstant; -import android.annotation.SystemApi; -import android.annotation.TestApi; import android.app.Notification; import android.app.NotificationChannel; import android.app.admin.DevicePolicyManager; @@ -61,11 +59,7 @@ import java.util.List; * <p> * All callbacks are called on the main thread. * </p> - * - * @hide */ -@SystemApi -@TestApi public abstract class NotificationAssistantService extends NotificationListenerService { private static final String TAG = "NotificationAssistants"; @@ -109,6 +103,7 @@ public abstract class NotificationAssistantService extends NotificationListenerS * * @param sbn the notification to snooze * @param snoozeCriterionId the {@link SnoozeCriterion#getId()} representing a device context. + * @hide */ abstract public void onNotificationSnoozedUntilContext(StatusBarNotification sbn, String snoozeCriterionId); @@ -250,6 +245,7 @@ public abstract class NotificationAssistantService extends NotificationListenerS * {@link #onNotificationPosted(StatusBarNotification, RankingMap)} callback for the * notification. * @param key The key of the notification to snooze + * @hide */ public final void unsnoozeNotification(String key) { if (!isBound()) return; diff --git a/core/java/android/service/notification/NotificationListenerService.java b/core/java/android/service/notification/NotificationListenerService.java index 0e63cd37f3f2..c734b630759b 100644 --- a/core/java/android/service/notification/NotificationListenerService.java +++ b/core/java/android/service/notification/NotificationListenerService.java @@ -1617,14 +1617,16 @@ public abstract class NotificationListenerService extends Service { } /** - * @hide + * Returns a list of smart {@link Notification.Action} that can be added by the + * {@link NotificationAssistantService} */ public List<Notification.Action> getSmartActions() { return mSmartActions; } /** - * @hide + * Returns a list of smart replies that can be added by the + * {@link NotificationAssistantService} */ public List<CharSequence> getSmartReplies() { return mSmartReplies; diff --git a/core/java/android/service/notification/NotificationStats.java b/core/java/android/service/notification/NotificationStats.java index e5f3dfbe2a1c..814b4772a395 100644 --- a/core/java/android/service/notification/NotificationStats.java +++ b/core/java/android/service/notification/NotificationStats.java @@ -16,8 +16,6 @@ package android.service.notification; import android.annotation.IntDef; -import android.annotation.SystemApi; -import android.annotation.TestApi; import android.app.RemoteInput; import android.os.Parcel; import android.os.Parcelable; @@ -25,11 +23,6 @@ import android.os.Parcelable; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -/** - * @hide - */ -@TestApi -@SystemApi public final class NotificationStats implements Parcelable { private boolean mSeen; @@ -105,7 +98,7 @@ public final class NotificationStats implements Parcelable { public NotificationStats() { } - protected NotificationStats(Parcel in) { + private NotificationStats(Parcel in) { mSeen = in.readByte() != 0; mExpanded = in.readByte() != 0; mDirectReplied = in.readByte() != 0; |