Merge "Update documentation" into rvc-dev am: c01b818bae am: 336ae52021 am: 846b51b959 (b112cc26) · Commits · e / os / android_frameworks_base

core/java/android/app/NotificationManager.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ import android.content.ComponentName;
		import android.content.Context;
		import android.content.Intent;
		import android.content.pm.ParceledListSlice;
		import android.content.pm.ShortcutInfo;
		import android.graphics.drawable.Icon;
		import android.net.Uri;
		import android.os.Build;
		@@ -841,7 +842,8 @@ public class NotificationManager {
		}

		/**
		* Returns the notification channel settings for a given channel and conversation id.
		* Returns the notification channel settings for a given channel and
		* {@link ShortcutInfo#getId() conversation id}.
		*
		* <p>The channel must belong to your package, or to a package you are an approved notification
		* delegate for (see {@link #canNotifyAsPackage(String)}), or it will not be returned. To query