Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Send last discovery preference to provider service" into rvc-dev

Browse Source
This commit is contained in:
Kyunglyul Hyun
2020-05-19 06:32:57 +00:00
committed by Android (Google) Code Review
parent 29ab886b04 f2b19c8b1f
commit c9d20f317d
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/media/MediaRoute2ProviderServiceProxy.java
View File

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