Fix tests and add notification sink kind to model verification

Author: joefarebrother

java/ql/test/library-tests/frameworks/android/notification/Test.java

@@ -942,14 +942,28 @@ public void test() throws Exception {
 			// "androidx.core.app;NotificationCompat$BigPictureStyle;true;bigLargeIcon;;;Argument[this];ReturnValue;value;manual"
 			NotificationCompat.BigPictureStyle out = null;
 			NotificationCompat.BigPictureStyle in = (NotificationCompat.BigPictureStyle) source();
-			out = in.bigLargeIcon(null);
+			out = in.bigLargeIcon((Bitmap)null);
+			sink(out); // $ hasValueFlow
+		}
+		{
+			// "androidx.core.app;NotificationCompat$BigPictureStyle;true;bigLargeIcon;;;Argument[this];ReturnValue;value;manual"
+			NotificationCompat.BigPictureStyle out = null;
+			NotificationCompat.BigPictureStyle in = (NotificationCompat.BigPictureStyle) source();
+			out = in.bigLargeIcon((Icon)null);
+			sink(out); // $ hasValueFlow
+		}
+		{
+			// "androidx.core.app;NotificationCompat$BigPictureStyle;true;bigPicture;;;Argument[this];ReturnValue;value;manual"
+			NotificationCompat.BigPictureStyle out = null;
+			NotificationCompat.BigPictureStyle in = (NotificationCompat.BigPictureStyle) source();
+			out = in.bigPicture((Bitmap)null);
 			sink(out); // $ hasValueFlow
 		}
 		{
 			// "androidx.core.app;NotificationCompat$BigPictureStyle;true;bigPicture;;;Argument[this];ReturnValue;value;manual"
 			NotificationCompat.BigPictureStyle out = null;
 			NotificationCompat.BigPictureStyle in = (NotificationCompat.BigPictureStyle) source();
-			out = in.bigPicture(null);
+			out = in.bigPicture((Icon)null);
 			sink(out); // $ hasValueFlow
 		}
 		{
@@ -1040,7 +1054,14 @@ public void test() throws Exception {
 			// "androidx.core.app;NotificationCompat$Builder;true;addPerson;;;Argument[this];ReturnValue;value;manual"
 			NotificationCompat.Builder out = null;
 			NotificationCompat.Builder in = (NotificationCompat.Builder) source();
-			out = in.addPerson(null);
+			out = in.addPerson((androidx.core.app.Person)null);
+			sink(out); // $ hasValueFlow
+		}
+		{
+			// "androidx.core.app;NotificationCompat$Builder;true;addPerson;;;Argument[this];ReturnValue;value;manual"
+			NotificationCompat.Builder out = null;
+			NotificationCompat.Builder in = (NotificationCompat.Builder) source();
+			out = in.addPerson((String)null);
 			sink(out); // $ hasValueFlow
 		}
 		{
@@ -1252,7 +1273,14 @@ public void test() throws Exception {
 			// "androidx.core.app;NotificationCompat$Builder;true;setLargeIcon;;;Argument[this];ReturnValue;value;manual"
 			NotificationCompat.Builder out = null;
 			NotificationCompat.Builder in = (NotificationCompat.Builder) source();
-			out = in.setLargeIcon(null);
+			out = in.setLargeIcon((Bitmap)null);
+			sink(out); // $ hasValueFlow
+		}
+		{
+			// "androidx.core.app;NotificationCompat$Builder;true;setLargeIcon;;;Argument[this];ReturnValue;value;manual"
+			NotificationCompat.Builder out = null;
+			NotificationCompat.Builder in = (NotificationCompat.Builder) source();
+			out = in.setLargeIcon((Icon)null);
 			sink(out); // $ hasValueFlow
 		}
 		{

shared/mad/codeql/mad/ModelValidation.qll

@@ -32,8 +32,9 @@ module KindValidation<KindValidationConfigSig Config> {
           // Java-only currently, but may be shared in the future
           "bean-validation", "fragment-injection", "groovy-injection", "hostname-verification",
           "information-leak", "intent-redirection", "jexl-injection", "jndi-injection",
-          "mvel-injection", "ognl-injection", "pending-intents", "response-splitting",
-          "trust-boundary-violation", "template-injection", "xpath-injection", "xslt-injection",
+          "mvel-injection", "notification", "ognl-injection", "pending-intents",
+          "response-splitting", "trust-boundary-violation", "template-injection", "xpath-injection",
+          "xslt-injection",
           // JavaScript-only currently, but may be shared in the future
           "mongodb.sink", "nosql-injection", "unsafe-deserialization",
           // Swift-only currently, but may be shared in the future