Merge "Bubbles / notifs / shortcuts: if the id's don't match throw an error" (e71999af) · Commits · e / os / android_frameworks_base

core/java/android/app/Notification.java

+28 −0

Original line number	Original line	Diff line number	Diff line
	@@ -3569,8 +3569,16 @@ public class Notification implements Parcelable
	* This field will be ignored by Launchers that don't support badging, don't show		* This field will be ignored by Launchers that don't support badging, don't show
	* notification content, or don't show {@link android.content.pm.ShortcutManager shortcuts}.		* notification content, or don't show {@link android.content.pm.ShortcutManager shortcuts}.
	*		*
			* If this notification has {@link BubbleMetadata} attached that was created with
			* {@link BubbleMetadata.Builder#createShortcutBubble(String)} a check will be performed
			* to ensure the shortcutId supplied to bubble metadata matches the shortcutId set here,
			* if one was set. If the shortcutId's were specified but do not match, an exception
			* is thrown.
			*
	* @param shortcutId the {@link ShortcutInfo#getId() id} of the shortcut this notification		* @param shortcutId the {@link ShortcutInfo#getId() id} of the shortcut this notification
	* supersedes		* supersedes
			*
			* @see BubbleMetadata.Builder#createShortcutBubble(String)
	*/		*/
	@NonNull		@NonNull
	public Builder setShortcutId(String shortcutId) {		public Builder setShortcutId(String shortcutId) {
	@@ -5926,9 +5934,29 @@ public class Notification implements Parcelable
	/**		/**
	* Combine all of the options that have been set and return a new {@link Notification}		* Combine all of the options that have been set and return a new {@link Notification}
	* object.		* object.
			*
			* If this notification has {@link BubbleMetadata} attached that was created with
			* {@link BubbleMetadata.Builder#createShortcutBubble(String)} a check will be performed
			* to ensure the shortcutId supplied to bubble metadata matches the shortcutId set on the
			* notification builder, if one was set. If the shortcutId's were specified but do not
			* match, an exception is thrown here.
			*
			* @see BubbleMetadata.Builder#createShortcutBubble(String)
			* @see #setShortcutId(String)
	*/		*/
	@NonNull		@NonNull
	public Notification build() {		public Notification build() {
			// Check shortcut id matches
			if (mN.mShortcutId != null
			&& mN.mBubbleMetadata != null
			&& mN.mBubbleMetadata.getShortcutId() != null
			&& !mN.mShortcutId.equals(mN.mBubbleMetadata.getShortcutId())) {
			throw new IllegalArgumentException(
			"Notification and BubbleMetadata shortcut id's don't match,"
			+ " notification: " + mN.mShortcutId
			+ " vs bubble: " + mN.mBubbleMetadata.getShortcutId());
			}

	// first, add any extras from the calling code		// first, add any extras from the calling code
	if (mUserExtras != null) {		if (mUserExtras != null) {
	mN.extras = getAllExtras();		mN.extras = getAllExtras();