Merge "Added nullability annotations to API" into pi-dev (66b90a03) · Commits · e / os / android_frameworks_base

core/java/android/app/Notification.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -6431,6 +6431,7 @@ public class Notification implements Parcelable
		/**
		* @return the user to be displayed for any replies sent by the user
		*/
		@NonNull
		public Person getUser() {
		return mUser;
		}
		@@ -6505,7 +6506,8 @@ public class Notification implements Parcelable
		*
		* @return this object for method chaining
		*/
		public MessagingStyle addMessage(CharSequence text, long timestamp, Person sender) {
		public MessagingStyle addMessage(@NonNull CharSequence text, long timestamp,
		@Nullable Person sender) {
		return addMessage(new Message(text, timestamp, sender));
		}

		@@ -6935,7 +6937,7 @@ public class Notification implements Parcelable
		* to differentiate between the different users.
		* </p>
		*/
		public Message(CharSequence text, long timestamp, @Nullable Person sender){
		public Message(@NonNull CharSequence text, long timestamp, @Nullable Person sender) {
		mText = text;
		mTimestamp = timestamp;
		mSender = sender;