Merge "MediaRouter: Notify DiscoveryPreference after binding" into rvc-dev am:... (752e8464) · Commits · e / os / android_frameworks_base

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;
		}
		}
		}