@@ -35,16 +35,16 @@ extensions:
       - ["android.app", "NotificationManager", True, "notifyAsPackage", "(String,String,int,Notification)", "", "Argument[3]", "pending-intents", "manual"]
       - ["android.app", "NotificationManager", True, "notifyAsUser", "(String,int,Notification,UserHandle)", "", "Argument[2]", "pending-intents", "manual"]
       - ["android.app", "PendingIntent", False, "send", "(Context,int,Intent)", "", "Argument[2]", "pending-intents", "manual"]
-      - ["android.app", "PendingIntent", False, "send", "(Context,int,Intent,OnFinished,Handler)", "", "Argument[2]", "pending-intents", "manual"]
-      - ["android.app", "PendingIntent", False, "send", "(Context,int,Intent,OnFinished,Handler,String)", "", "Argument[2]", "pending-intents", "manual"]
-      - ["android.app", "PendingIntent", False, "send", "(Context,int,Intent,OnFinished,Handler,String,Bundle)", "", "Argument[2]", "pending-intents", "manual"]
+      - ["android.app", "PendingIntent", False, "send", "(Context,int,Intent,PendingIntent$OnFinished,Handler)", "", "Argument[2]", "pending-intents", "manual"]
+      - ["android.app", "PendingIntent", False, "send", "(Context,int,Intent,PendingIntent$OnFinished,Handler,String)", "", "Argument[2]", "pending-intents", "manual"]
+      - ["android.app", "PendingIntent", False, "send", "(Context,int,Intent,PendingIntent$OnFinished,Handler,String,Bundle)", "", "Argument[2]", "pending-intents", "manual"]
   - addsTo:
       pack: codeql/java-all
       extensible: summaryModel
     data:
       - ["android.app", "Notification$Action", True, "Action", "(int,CharSequence,PendingIntent)", "", "Argument[2]", "Argument[this]", "taint", "manual"]
       - ["android.app", "Notification$Action", True, "getExtras", "", "", "Argument[this].SyntheticField[android.content.Intent.extras]", "ReturnValue", "value", "manual"]
-      - ["android.app", "Notification$Action$Builder", True, "Builder", "(Action)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["android.app", "Notification$Action$Builder", True, "Builder", "(Notification$Action)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
       - ["android.app", "Notification$Action$Builder", True, "Builder", "(Icon,CharSequence,PendingIntent)", "", "Argument[2]", "Argument[this]", "taint", "manual"]
       - ["android.app", "Notification$Action$Builder", True, "Builder", "(int,CharSequence,PendingIntent)", "", "Argument[2]", "Argument[this]", "taint", "manual"]
       - ["android.app", "Notification$Action$Builder", True, "addExtras", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
@@ -59,19 +59,19 @@ extensions:
       - ["android.app", "Notification$Action$Builder", True, "setAuthenticationRequired", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
       - ["android.app", "Notification$Action$Builder", True, "setContextual", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
       - ["android.app", "Notification$Action$Builder", True, "setSemanticAction", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
-      - ["android.app", "Notification$BigPictureStyle", True, "BigPictureStyle", "(Builder)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["android.app", "Notification$BigPictureStyle", True, "BigPictureStyle", "(Notification$Builder)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
       - ["android.app", "Notification$BigPictureStyle", True, "bigLargeIcon", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
       - ["android.app", "Notification$BigPictureStyle", True, "bigPicture", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
       - ["android.app", "Notification$BigPictureStyle", True, "setBigContentTitle", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
       - ["android.app", "Notification$BigPictureStyle", True, "setContentDescription", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
       - ["android.app", "Notification$BigPictureStyle", True, "setSummaryText", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
       - ["android.app", "Notification$BigPictureStyle", True, "showBigPictureWhenCollapsed", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
-      - ["android.app", "Notification$BigTextStyle", True, "BigTextStyle", "(Builder)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["android.app", "Notification$BigTextStyle", True, "BigTextStyle", "(Notification$Builder)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
       - ["android.app", "Notification$BigTextStyle", True, "bigText", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
       - ["android.app", "Notification$BigTextStyle", True, "setBigContentTitle", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
       - ["android.app", "Notification$BigTextStyle", True, "setSummaryText", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
       - ["android.app", "Notification$Builder", True, "addAction", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
-      - ["android.app", "Notification$Builder", True, "addAction", "(Action)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["android.app", "Notification$Builder", True, "addAction", "(Notification$Action)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
       - ["android.app", "Notification$Builder", True, "addAction", "(int,CharSequence,PendingIntent)", "", "Argument[2]", "Argument[this]", "taint", "manual"]
       - ["android.app", "Notification$Builder", True, "addExtras", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
       - ["android.app", "Notification$Builder", True, "addExtras", "", "", "Argument[0].MapKey", "Argument[this].SyntheticField[android.content.Intent.extras].MapKey", "value", "manual"]
@@ -137,11 +137,11 @@ extensions:
       - ["android.app", "Notification$Builder", True, "setVibrate", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
       - ["android.app", "Notification$Builder", True, "setVisibility", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
       - ["android.app", "Notification$Builder", True, "setWhen", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
-      - ["android.app", "Notification$InboxStyle", True, "InboxStyle", "(Builder)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["android.app", "Notification$InboxStyle", True, "InboxStyle", "(Notification$Builder)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
       - ["android.app", "Notification$InboxStyle", True, "addLine", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
       - ["android.app", "Notification$InboxStyle", True, "setBigContentTitle", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
       - ["android.app", "Notification$InboxStyle", True, "setSummaryText", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
-      - ["android.app", "Notification$MediaStyle", True, "MediaStyle", "(Builder)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["android.app", "Notification$MediaStyle", True, "MediaStyle", "(Notification$Builder)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
       - ["android.app", "Notification$MediaStyle", True, "setMediaSession", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
       - ["android.app", "Notification$MediaStyle", True, "setShowActionsInCompactView", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
       - ["android.app", "Notification$Style", True, "build", "", "", "Argument[this]", "ReturnValue", "taint", "manual"]
@@ -22,18 +22,18 @@ extensions:
       - ["android.database.sqlite", "SQLiteDatabase", False, "query", "(boolean,String,String[],String,String[],String,String,String,String,CancellationSignal)", "", "Argument[2]", "sql-injection", "manual"]
       - ["android.database.sqlite", "SQLiteDatabase", False, "query", "(boolean,String,String[],String,String[],String,String,String,String,CancellationSignal)", "", "Argument[3]", "sql-injection", "manual"]
       - ["android.database.sqlite", "SQLiteDatabase", False, "query", "(boolean,String,String[],String,String[],String,String,String,String,CancellationSignal)", "", "Argument[5..8]", "sql-injection", "manual"]
-      - ["android.database.sqlite", "SQLiteDatabase", False, "queryWithFactory", "(CursorFactory,boolean,String,String[],String,String[],String,String,String,String)", "", "Argument[2]", "sql-injection", "manual"]
-      - ["android.database.sqlite", "SQLiteDatabase", False, "queryWithFactory", "(CursorFactory,boolean,String,String[],String,String[],String,String,String,String)", "", "Argument[3]", "sql-injection", "manual"]
-      - ["android.database.sqlite", "SQLiteDatabase", False, "queryWithFactory", "(CursorFactory,boolean,String,String[],String,String[],String,String,String,String)", "", "Argument[4]", "sql-injection", "manual"]
-      - ["android.database.sqlite", "SQLiteDatabase", False, "queryWithFactory", "(CursorFactory,boolean,String,String[],String,String[],String,String,String,String)", "", "Argument[6..9]", "sql-injection", "manual"]
-      - ["android.database.sqlite", "SQLiteDatabase", False, "queryWithFactory", "(CursorFactory,boolean,String,String[],String,String[],String,String,String,String,CancellationSignal)", "", "Argument[2]", "sql-injection", "manual"]
-      - ["android.database.sqlite", "SQLiteDatabase", False, "queryWithFactory", "(CursorFactory,boolean,String,String[],String,String[],String,String,String,String,CancellationSignal)", "", "Argument[3]", "sql-injection", "manual"]
-      - ["android.database.sqlite", "SQLiteDatabase", False, "queryWithFactory", "(CursorFactory,boolean,String,String[],String,String[],String,String,String,String,CancellationSignal)", "", "Argument[4]", "sql-injection", "manual"]
-      - ["android.database.sqlite", "SQLiteDatabase", False, "queryWithFactory", "(CursorFactory,boolean,String,String[],String,String[],String,String,String,String,CancellationSignal)", "", "Argument[6..9]", "sql-injection", "manual"]
+      - ["android.database.sqlite", "SQLiteDatabase", False, "queryWithFactory", "(SQLiteDatabase$CursorFactory,boolean,String,String[],String,String[],String,String,String,String)", "", "Argument[2]", "sql-injection", "manual"]
+      - ["android.database.sqlite", "SQLiteDatabase", False, "queryWithFactory", "(SQLiteDatabase$CursorFactory,boolean,String,String[],String,String[],String,String,String,String)", "", "Argument[3]", "sql-injection", "manual"]
+      - ["android.database.sqlite", "SQLiteDatabase", False, "queryWithFactory", "(SQLiteDatabase$CursorFactory,boolean,String,String[],String,String[],String,String,String,String)", "", "Argument[4]", "sql-injection", "manual"]
+      - ["android.database.sqlite", "SQLiteDatabase", False, "queryWithFactory", "(SQLiteDatabase$CursorFactory,boolean,String,String[],String,String[],String,String,String,String)", "", "Argument[6..9]", "sql-injection", "manual"]
+      - ["android.database.sqlite", "SQLiteDatabase", False, "queryWithFactory", "(SQLiteDatabase$CursorFactory,boolean,String,String[],String,String[],String,String,String,String,CancellationSignal)", "", "Argument[2]", "sql-injection", "manual"]
+      - ["android.database.sqlite", "SQLiteDatabase", False, "queryWithFactory", "(SQLiteDatabase$CursorFactory,boolean,String,String[],String,String[],String,String,String,String,CancellationSignal)", "", "Argument[3]", "sql-injection", "manual"]
+      - ["android.database.sqlite", "SQLiteDatabase", False, "queryWithFactory", "(SQLiteDatabase$CursorFactory,boolean,String,String[],String,String[],String,String,String,String,CancellationSignal)", "", "Argument[4]", "sql-injection", "manual"]
+      - ["android.database.sqlite", "SQLiteDatabase", False, "queryWithFactory", "(SQLiteDatabase$CursorFactory,boolean,String,String[],String,String[],String,String,String,String,CancellationSignal)", "", "Argument[6..9]", "sql-injection", "manual"]
       - ["android.database.sqlite", "SQLiteDatabase", False, "rawQuery", "(String,String[])", "", "Argument[0]", "sql-injection", "manual"]
       - ["android.database.sqlite", "SQLiteDatabase", False, "rawQuery", "(String,String[],CancellationSignal)", "", "Argument[0]", "sql-injection", "manual"]
-      - ["android.database.sqlite", "SQLiteDatabase", False, "rawQueryWithFactory", "(CursorFactory,String,String[],String)", "", "Argument[1]", "sql-injection", "manual"]
-      - ["android.database.sqlite", "SQLiteDatabase", False, "rawQueryWithFactory", "(CursorFactory,String,String[],String,CancellationSignal)", "", "Argument[1]", "sql-injection", "manual"]
+      - ["android.database.sqlite", "SQLiteDatabase", False, "rawQueryWithFactory", "(SQLiteDatabase$CursorFactory,String,String[],String)", "", "Argument[1]", "sql-injection", "manual"]
+      - ["android.database.sqlite", "SQLiteDatabase", False, "rawQueryWithFactory", "(SQLiteDatabase$CursorFactory,String,String[],String,CancellationSignal)", "", "Argument[1]", "sql-injection", "manual"]
       - ["android.database.sqlite", "SQLiteDatabase", False, "update", "(String,ContentValues,String,String[])", "", "Argument[0]", "sql-injection", "manual"]
       - ["android.database.sqlite", "SQLiteDatabase", False, "update", "(String,ContentValues,String,String[])", "", "Argument[2]", "sql-injection", "manual"]
       - ["android.database.sqlite", "SQLiteDatabase", False, "updateWithOnConflict", "(String,ContentValues,String,String[],int)", "", "Argument[0]", "sql-injection", "manual"]
 
@@ -16,7 +16,7 @@ extensions:
       - ["androidx.core.app", "NotificationCompat$Action", True, "Action", "(IconCompat,CharSequence,PendingIntent)", "", "Argument[2]", "Argument[this]", "taint", "manual"]
       - ["androidx.core.app", "NotificationCompat$Action", True, "Action", "(int,CharSequence,PendingIntent)", "", "Argument[2]", "Argument[this]", "taint", "manual"]
       - ["androidx.core.app", "NotificationCompat$Action", True, "getExtras", "", "", "Argument[this].SyntheticField[android.content.Intent.extras]", "ReturnValue", "value", "manual"]
-      - ["androidx.core.app", "NotificationCompat$Action$Builder", True, "Builder", "(Action)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["androidx.core.app", "NotificationCompat$Action$Builder", True, "Builder", "(NotificationCompat$Action)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
       - ["androidx.core.app", "NotificationCompat$Action$Builder", True, "Builder", "(IconCompat,CharSequence,PendingIntent)", "", "Argument[2]", "Argument[this]", "taint", "manual"]
       - ["androidx.core.app", "NotificationCompat$Action$Builder", True, "Builder", "(int,CharSequence,PendingIntent)", "", "Argument[2]", "Argument[this]", "taint", "manual"]
       - ["androidx.core.app", "NotificationCompat$Action$Builder", True, "addExtras", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
@@ -41,7 +41,7 @@ extensions:
       - ["androidx.core.app", "NotificationCompat$BigTextStyle", True, "setBigContentTitle", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
       - ["androidx.core.app", "NotificationCompat$BigTextStyle", True, "setSummaryText", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
       - ["androidx.core.app", "NotificationCompat$Builder", True, "addAction", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
-      - ["androidx.core.app", "NotificationCompat$Builder", True, "addAction", "(Action)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["androidx.core.app", "NotificationCompat$Builder", True, "addAction", "(NotificationCompat$Action)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
       - ["androidx.core.app", "NotificationCompat$Builder", True, "addAction", "(int,CharSequence,PendingIntent)", "", "Argument[2]", "Argument[this]", "taint", "manual"]
       - ["androidx.core.app", "NotificationCompat$Builder", True, "addExtras", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
       - ["androidx.core.app", "NotificationCompat$Builder", True, "addExtras", "", "", "Argument[0].MapKey", "Argument[this].SyntheticField[android.content.Intent.extras].MapKey", "value", "manual"]