Generate androidx stubs and correct some models

Author: joefarebrother

java/ql/lib/ext/androidx.core.app.model.yml

@@ -11,7 +11,7 @@ extensions:
       - ["androidx.core.app", "NotificationManagerCompat", True, "notify", "(int,Notification)", "", "Argument[1]", "pending-intents", "manual"]
 
       - ["androidx.core.app", "NotificationCompat$Action", True, "Action", "(int,CharSequence,PendingIntent)", "", "Argument[1..2]", "notification", "manual"]
-      - ["androidx.core.app", "NotificationCompat$Action$Builder", True, "Builder", "(Icon,CharSequence,PendingIntent)", "", "Argument[1..2]", "notification", "manual"]
+      - ["androidx.core.app", "NotificationCompat$Action$Builder", True, "Builder", "(IconCompat,CharSequence,PendingIntent)", "", "Argument[1..2]", "notification", "manual"]
       - ["androidx.core.app", "NotificationCompat$Action$Builder", True, "Builder", "(int,CharSequence,PendingIntent)", "", "Argument[1..2]", "notification", "manual"]
       - ["androidx.core.app", "NotificationCompat$Action$Builder", True, "addExtras", "(Bundle)", "", "Argument[0]", "notification", "manual"]
       - ["androidx.core.app", "NotificationCompat$BigPictureStyle", True, "setBigContentTitle", "(CharSequence)", "", "Argument[0]", "notification", "manual"]
@@ -47,8 +47,6 @@ extensions:
       - ["androidx.core.app", "NotificationCompat$InboxStyle", True, "addLine", "(CharSequence)", "", "Argument[0]", "notification", "manual"]
       - ["androidx.core.app", "NotificationCompat$InboxStyle", True, "setBigContentTitle", "(CharSequence)", "", "Argument[0]", "notification", "manual"]
       - ["androidx.core.app", "NotificationCompat$InboxStyle", True, "setSummaryText", "(CharSequence)", "", "Argument[0]", "notification", "manual"]
-      - ["androidx.core.app", "NotificationCompat$MediaStyle", True, "setRemotePlaybackInfo", "(CharSequence,int,PendingIntent)", "", "Argument[0]", "notification", "manual"]
-      - ["androidx.core.app", "NotificationCompat$MediaStyle", True, "setRemotePlaybackInfo", "(CharSequence,int,PendingIntent)", "", "Argument[2]", "notification", "manual"]
       - ["androidx.core.app", "NotificationCompat$MessagingStyle", True, "addMessage", "(CharSequence,long,CharSequence)", "", "Argument[0]", "notification", "manual"]
       - ["androidx.core.app", "NotificationCompat$MessagingStyle", True, "addMessage", "(CharSequence,long,CharSequence)", "", "Argument[2]", "notification", "manual"]
       - ["androidx.core.app", "NotificationCompat$MessagingStyle", True, "addMessage", "(CharSequence,long,Person)", "", "Argument[0]", "notification", "manual"]

java/ql/test/query-tests/security/CWE-200/semmle/tests/SensitiveNotification/Test.java

@@ -1,6 +1,5 @@
 import android.app.Activity;
 import android.app.Notification;
-import android.app.Person;
 import androidx.core.app.NotificationCompat;
 import android.content.Intent;
 import android.app.PendingIntent;
@@ -43,17 +42,17 @@ void test(String password) {
             .addLine(password) // $sensitive-notification
             .setBigContentTitle(password) // $sensitive-notification
             .setSummaryText(password)); // $sensitive-notification
-        builder.setStyle(new Notification.MediaStyle()
-            .setRemotePlaybackInfo(password, 0, null) // $sensitive-notification
-            .setRemotePlaybackInfo("", 0, pintent)); // $MISSING: sensitive-notification
+        // builder.setStyle(new Notification.MediaStyle()
+        //     .setRemotePlaybackInfo(password, 0, null) // $sensitive-notification
+        //     .setRemotePlaybackInfo("", 0, pintent)); // $MISSING: sensitive-notification
         builder.setStyle( 
                 new Notification.MessagingStyle(password) // $sensitive-notification
                     .setConversationTitle(password) // $sensitive-notification
                     .addMessage(password, 0, "") // $sensitive-notification
-                    .addMessage(password, 0, (Person)null) // $sensitive-notification
+                    .addMessage(password, 0, (android.app.Person)null) // $sensitive-notification
                     .addMessage("", 0, password) // $sensitive-notification
                     .addMessage(new Notification.MessagingStyle.Message(password, 0, "")) // $sensitive-notification
-                    .addMessage(new Notification.MessagingStyle.Message(password, 0, (Person)null)) // $sensitive-notification
+                    .addMessage(new Notification.MessagingStyle.Message(password, 0, (android.app.Person)null)) // $sensitive-notification
                     .addMessage(new Notification.MessagingStyle.Message("", 0, password)) // $sensitive-notification
                 );
 
@@ -121,17 +120,14 @@ void test3(String password) {
             .addLine(password) // $sensitive-notification
             .setBigContentTitle(password) // $sensitive-notification
             .setSummaryText(password)); // $sensitive-notification
-        builder.setStyle(new NotificationCompat.MediaStyle()
-            .setRemotePlaybackInfo(password, 0, null) // $sensitive-notification
-            .setRemotePlaybackInfo("", 0, pintent)); // $MISSING: sensitive-notification
         builder.setStyle( 
                 new NotificationCompat.MessagingStyle(password) // $sensitive-notification
                     .setConversationTitle(password) // $sensitive-notification
                     .addMessage(password, 0, "") // $sensitive-notification
-                    .addMessage(password, 0, (Person)null) // $sensitive-notification
+                    .addMessage(password, 0, (androidx.core.app.Person)null) // $sensitive-notification
                     .addMessage("", 0, password) // $sensitive-notification
                     .addMessage(new NotificationCompat.MessagingStyle.Message(password, 0, "")) // $sensitive-notification
-                    .addMessage(new NotificationCompat.MessagingStyle.Message(password, 0, (Person)null)) // $sensitive-notification
+                    .addMessage(new NotificationCompat.MessagingStyle.Message(password, 0, (androidx.core.app.Person)null)) // $sensitive-notification
                     .addMessage(new NotificationCompat.MessagingStyle.Message("", 0, password)) // $sensitive-notification
                 );