Merge "Send last discovery preference to provider service" into rvc-dev am:... (857831cc) · Commits · e / os / android_frameworks_base

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

+4 −6

Original line number	Original line	Diff line number	Diff line
	@@ -60,7 +60,7 @@ final class MediaRoute2ProviderServiceProxy extends MediaRoute2Provider
	private Connection mActiveConnection;		private Connection mActiveConnection;
	private boolean mConnectionReady;		private boolean mConnectionReady;

	private RouteDiscoveryPreference mPendingDiscoveryPreference = null;		private RouteDiscoveryPreference mLastDiscoveryPreference = null;

	MediaRoute2ProviderServiceProxy(@NonNull Context context, @NonNull ComponentName componentName,		MediaRoute2ProviderServiceProxy(@NonNull Context context, @NonNull ComponentName componentName,
	int userId) {		int userId) {
	@@ -98,11 +98,10 @@ final class MediaRoute2ProviderServiceProxy extends MediaRoute2Provider

	@Override		@Override
	public void updateDiscoveryPreference(RouteDiscoveryPreference discoveryPreference) {		public void updateDiscoveryPreference(RouteDiscoveryPreference discoveryPreference) {
			mLastDiscoveryPreference = discoveryPreference;
	if (mConnectionReady) {		if (mConnectionReady) {
	mActiveConnection.updateDiscoveryPreference(discoveryPreference);		mActiveConnection.updateDiscoveryPreference(discoveryPreference);
	updateBinding();		updateBinding();
	} else {
	mPendingDiscoveryPreference = discoveryPreference;
	}		}
	}		}

	@@ -277,9 +276,8 @@ final class MediaRoute2ProviderServiceProxy extends MediaRoute2Provider
	private void onConnectionReady(Connection connection) {		private void onConnectionReady(Connection connection) {
	if (mActiveConnection == connection) {		if (mActiveConnection == connection) {
	mConnectionReady = true;		mConnectionReady = true;
	if (mPendingDiscoveryPreference != null) {		if (mLastDiscoveryPreference != null) {
	updateDiscoveryPreference(mPendingDiscoveryPreference);		updateDiscoveryPreference(mLastDiscoveryPreference);
	mPendingDiscoveryPreference = null;
	}		}
	}		}
	}		}