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

Commit b85b1545 authored by Derek Jedral's avatar Derek Jedral Committed by Android (Google) Code Review
Browse files

Merge "Propagate visibility of UMO to routers" into main

parents d6e7862c 214b6381

packages/SettingsLib/src/com/android/settingslib/media/InfoMediaManager.java

+3 −0
Original line number Diff line number Diff line
@@ -704,6 +704,9 @@ public abstract class InfoMediaManager { 
        return mSuggestedDeviceState;

    }



    /** Requests a suggestion from other routers. */

    public abstract void requestDeviceSuggestion();



    @TargetApi(Build.VERSION_CODES.R)

    boolean shouldEnableVolumeSeekBar(RoutingSessionInfo sessionInfo) {

        return sessionInfo.isSystemSession() // System sessions are not remote

packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java

+10 −0
Original line number Diff line number Diff line
@@ -244,6 +244,16 @@ public class LocalMediaManager implements BluetoothCallback { 
        }

    }



    /** Requests a suggestion from other routers. */

    public void requestDeviceSuggestion() {

        mInfoMediaManager.requestDeviceSuggestion();

    }



    @Nullable

    public SuggestedDeviceState getSuggestedDevice() {

        return mInfoMediaManager.getSuggestedDevice();

    }



    private boolean connectToDeviceIfConnectionPending(MediaDevice device) {

        synchronized (mMediaDevicesLock) {

            if (mConnectingSuggestedDeviceState != null

packages/SettingsLib/src/com/android/settingslib/media/ManagerInfoMediaManager.java

+5 −0
Original line number Diff line number Diff line
@@ -187,6 +187,11 @@ public class ManagerInfoMediaManager extends InfoMediaManager { 
        return mRouterManager.getTransferableRoutes(packageName);

    }



    @Override

    public void requestDeviceSuggestion() {

        // no-op, not supported by ManagerInfoMediaManager

    }



    @VisibleForTesting

    /* package */ final class RouterManagerCallback implements MediaRouter2Manager.Callback {

packages/SettingsLib/src/com/android/settingslib/media/NoOpInfoMediaManager.java

+5 −0
Original line number Diff line number Diff line
@@ -175,4 +175,9 @@ import java.util.List; 
    protected List<MediaRoute2Info> getTransferableRoutes(@NonNull String packageName) {

        return Collections.emptyList();

    }



    @Override

    public void requestDeviceSuggestion() {

        // no-op, not supported by NoOpInfoMediaManager

    }

}

packages/SettingsLib/src/com/android/settingslib/media/RouterInfoMediaManager.java

+5 −0
Original line number Diff line number Diff line
@@ -320,6 +320,11 @@ public final class RouterInfoMediaManager extends InfoMediaManager { 
        return getTransferableRoutes(activeController);

    }



    @Override

    public void requestDeviceSuggestion() {

        mRouter.notifyDeviceSuggestionRequested();

    }



    @NonNull

    private List<MediaRoute2Info> getTransferableRoutes(@Nullable RoutingController controller) {

        HashMap<String, MediaRoute2Info> transferableRoutes = new HashMap<>();