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

Commit 802b9741 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Make the default system session non-releasable" into main

parents 7805d8ff ee995362

services/core/java/com/android/server/media/SystemMediaRoute2Provider.java

+5 −1
Original line number Diff line number Diff line
@@ -413,6 +413,10 @@ class SystemMediaRoute2Provider extends MediaRoute2Provider { 


            if (Flags.enableOutputSwitcherPersonalAudioSharing()) {

                builder.setReleaseType(mDeviceRouteController.getSessionReleaseType());

            } else {

                // Releasing the system routing session only makes sense in the context of

                // Flags.enableOutputSwitcherPersonalAudioSharing.

                builder.setReleaseType(RoutingSessionInfo.RELEASE_UNSUPPORTED);

            }



            return builder.setProviderId(mUniqueId).build();
@@ -590,7 +594,7 @@ class SystemMediaRoute2Provider extends MediaRoute2Provider { 
                                .setTransferInitiator(

                                        newSessionInfo.getTransferInitiatorUserHandle(),

                                        newSessionInfo.getTransferInitiatorPackageName())

                                .setReleaseType(newSessionInfo.getReleaseType())

                                .setReleaseType(RoutingSessionInfo.RELEASE_UNSUPPORTED)

                                .build();

                return true;

            }