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

Commit bab0cdad authored by Kyunglyul Hyun's avatar Kyunglyul Hyun
Browse files

MediaRouter: Notify DiscoveryPreference after binding 

When the discovery preference is updated and it's not bound,
the proxy caches the discovery preference and notify the service
when it's bound.

We don't need to pending other commands since we can't do before
the service is bound.(e.g. we don't have a route to select if provider
is not connected)

Bug: 151063538
Bug: 151128724
Test: cts test and manually by sideloading GmsCore
Change-Id: I684806524909c977d6ac246773610899aa3e047a
parent d6956d77

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

+8 −0
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ final class MediaRoute2ProviderServiceProxy extends MediaRoute2Provider 
    private Connection mActiveConnection;

    private boolean mConnectionReady;



    private RouteDiscoveryPreference mPendingDiscoveryPreference = null;



    MediaRoute2ProviderServiceProxy(@NonNull Context context, @NonNull ComponentName componentName,

            int userId) {

        super(componentName);
@@ -99,6 +101,8 @@ final class MediaRoute2ProviderServiceProxy extends MediaRoute2Provider 
        if (mConnectionReady) {

            mActiveConnection.updateDiscoveryPreference(discoveryPreference);

            updateBinding();

        } else {

            mPendingDiscoveryPreference = discoveryPreference;

        }

    }
@@ -271,6 +275,10 @@ final class MediaRoute2ProviderServiceProxy extends MediaRoute2Provider 
    private void onConnectionReady(Connection connection) {

        if (mActiveConnection == connection) {

            mConnectionReady = true;

            if (mPendingDiscoveryPreference != null) {

                updateDiscoveryPreference(mPendingDiscoveryPreference);

                mPendingDiscoveryPreference = null;

            }

        }

    }