From 057413fcb25b14573e00f3dfee4f65c514ccc432 Mon Sep 17 00:00:00 2001
From: James Crutchley <ne0rmatrix@gmail.com>
Date: Mon, 9 Sep 2024 21:32:33 -0700
Subject: [PATCH] Update metadata attributes for MediaLibrarySession and
 MediaSession

Replaced `remove-node` elements with `attr` elements defining `managedName` attributes for methods in `MediaLibraryService.MediaLibrarySession.Builder` and `MediaSession.Builder` classes. Updated parameter names for `setSessionActivity`, `setId`, `setExtras`, and `setBitmapLoader` methods to improve clarity. Retained `remove-node` element for `build` method in `MediaLibraryService.MediaLibrarySession.Builder`.
---
 .../media3-session/Transforms/Metadata.xml    | 68 ++++++++++++-------
 1 file changed, 43 insertions(+), 25 deletions(-)

diff --git a/source/androidx.media3/media3-session/Transforms/Metadata.xml b/source/androidx.media3/media3-session/Transforms/Metadata.xml
index fc4c62b8..b1298316 100644
--- a/source/androidx.media3/media3-session/Transforms/Metadata.xml
+++ b/source/androidx.media3/media3-session/Transforms/Metadata.xml
@@ -1,31 +1,49 @@
-<metadata>
-    <remove-node
-        path="/api/package[@name='androidx.media3.session']/class[@name='MediaLibraryService.MediaLibrarySession.Builder']/method[@name='setSessionActivity' and count(parameter)=1 and parameter[1][@type='android.app.PendingIntent']]"        
-        />
-    <remove-node
-        path="/api/package[@name='androidx.media3.session']/class[@name='MediaLibraryService.MediaLibrarySession.Builder']/method[@name='setId' and count(parameter)=1 and parameter[1][@type='java.lang.String']]"
-        />
-    <remove-node
-        path="/api/package[@name='androidx.media3.session']/class[@name='MediaLibraryService.MediaLibrarySession.Builder']/method[@name='setExtras' and count(parameter)=1 and parameter[1][@type='android.os.Bundle']]"
-        />
-    <remove-node
-        path="/api/package[@name='androidx.media3.session']/class[@name='MediaLibraryService.MediaLibrarySession.Builder']/method[@name='setBitmapLoader' and count(parameter)=1 and parameter[1][@type='androidx.media3.session.BitmapLoader']]"
-        />
+<metadata>
+    <attr
+        path="/api/package[@name='androidx.media3.session']/class[@name='MediaLibraryService.MediaLibrarySession.Builder']/method[@name='setSessionActivity' and count(parameter)=1 and parameter[1][@name='p0']]"        
+        name="managedName"
+		    >
+		    PendingIntent
+	  </attr>
+    <attr
+        path="/api/package[@name='androidx.media3.session']/class[@name='MediaLibraryService.MediaLibrarySession.Builder']/method[@name='setId' and count(parameter)=1 and parameter[1][@name='p0']]"
+        name="managedName"
+		    >
+		    Id
+	  </attr>
+    <attr
+        path="/api/package[@name='androidx.media3.session']/class[@name='MediaLibraryService.MediaLibrarySession.Builder']/method[@name='setExtras' and count(parameter)=1 and parameter[1][@name='p0']]"
+        name="managedName"
+		    >
+		    TokenExtras
+	  </attr>
     <remove-node
         path="/api/package[@name='androidx.media3.session']/class[@name='MediaLibraryService.MediaLibrarySession.Builder']/method[@name='build' and count(parameter)=0]"
         />
-    <remove-node
-        path="/api/package[@name='androidx.media3.session']/class[@name='MediaSession.Builder']/method[@name='setSessionActivity' and count(parameter)=1 and parameter[1][@type='android.app.PendingIntent']]"
-        />
-    <remove-node
-        path="/api/package[@name='androidx.media3.session']/class[@name='MediaSession.Builder']/method[@name='setId' and count(parameter)=1 and parameter[1][@type='java.lang.String']]"
-        />
-    <remove-node
-        path="/api/package[@name='androidx.media3.session']/class[@name='MediaSession.Builder']/method[@name='setExtras' and count(parameter)=1 and parameter[1][@type='android.os.Bundle']]"
-        />
-    <remove-node
-        path="/api/package[@name='androidx.media3.session']/class[@name='MediaSession.Builder']/method[@name='setBitmapLoader' and count(parameter)=1 and parameter[1][@type='androidx.media3.session.BitmapLoader']]"
-        />
+    <attr
+        path="/api/package[@name='androidx.media3.session']/class[@name='MediaSession.Builder']/method[@name='setSessionActivity' and count(parameter)=1 and parameter[1][@name='p0']]"
+        name="managedName"
+		    >
+		    ActivityPendingIntent
+	  </attr>
+    <attr
+        path="/api/package[@name='androidx.media3.session']/class[@name='MediaSession.Builder']/method[@name='setId' and count(parameter)=1 and parameter[1][@name='p0']]"
+        name="managedName"
+        >
+        Id
+    </attr>
+    <attr
+        path="/api/package[@name='androidx.media3.session']/class[@name='MediaSession.Builder']/method[@name='setExtras' and count(parameter)=1 and parameter[1][@name='p0']]"
+        name="managedName"
+		    >
+		    Bundle
+	  </attr>
+    <attr
+        path="/api/package[@name='androidx.media3.session']/class[@name='MediaSession.Builder']/method[@name='setBitmapLoader' and count(parameter)=1 and parameter[1][@type='p0']]"
+        name="managedName"
+		    >
+		    BitmapLoader
+	  </attr>
     <attr
         path="/api/package[@name='androidx.media3.session']/class[@name='MediaLibraryService']/method[@name='onGetSession' and count(parameter)=1 and parameter[1][@type='androidx.media3.session.MediaSession.ControllerInfo']]"
         name="managedReturn"