Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 131f37da authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [3933355, 3933356, 3932456, 3933375, 3933415, 3933376] into pi-release 

Change-Id: I1734b814f38d72f6128f2b08f907027dc266a5f8
parents 25167320 57894536

android/app/src/com/android/bluetooth/newavrcp/BrowsedPlayerWrapper.java

+6 −2
Original line number Diff line number Diff line
@@ -292,8 +292,12 @@ class BrowsedPlayerWrapper { 
                }



                if (item.isBrowsable()) {

                    Folder f = new Folder(item.getMediaId(), false,

                            item.getDescription().getTitle().toString());

                    CharSequence titleCharSequence = item.getDescription().getTitle();

                    String title = "Not Provided";

                    if (titleCharSequence != null) {

                        title = titleCharSequence.toString();

                    }

                    Folder f = new Folder(item.getMediaId(), false, title);

                    return_list.add(new ListItem(f));

                } else {

                    return_list.add(new ListItem(Util.toMetadata(item)));

android/app/src/com/android/bluetooth/newavrcp/MediaPlayerList.java

+1 −1
Original line number Diff line number Diff line
@@ -547,7 +547,7 @@ public class MediaPlayerList { 
                if (intent.getBooleanExtra(Intent.EXTRA_REPLACING, false)) return;



                String packageName = intent.getData().getSchemeSpecificPart();

                if (packageName != null) {

                if (packageName != null && mMediaPlayerIds.containsKey(packageName)) {

                    removeMediaPlayer(mMediaPlayerIds.get(packageName));

                }

            } else if (action.equals(Intent.ACTION_PACKAGE_ADDED)