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 am: c9d20f317d

Browse Source 
Change-Id: I8b09e11ca3e84e44e4d7d8c73854b680ea38d1ac
This commit is contained in:
Kyunglyul Hyun
2020-05-19 06:55:55 +00:00
committed by Automerger Merge Worker
parent 8c1c72eaa0 c9d20f317d
commit d3eb223b7e
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 boolean mConnectionReady;
private RouteDiscoveryPreference mPendingDiscoveryPreference = null;
private RouteDiscoveryPreference mLastDiscoveryPreference = null;
MediaRoute2ProviderServiceProxy(@NonNull Context context, @NonNull ComponentName componentName,
int userId) {
@@ -98,11 +98,10 @@ final class MediaRoute2ProviderServiceProxy extends MediaRoute2Provider
@Override
public void updateDiscoveryPreference(RouteDiscoveryPreference discoveryPreference) {
mLastDiscoveryPreference = discoveryPreference;
if (mConnectionReady) {
mActiveConnection.updateDiscoveryPreference(discoveryPreference);
updateBinding();
} else {
mPendingDiscoveryPreference = discoveryPreference;
}
}
@@ -277,9 +276,8 @@ final class MediaRoute2ProviderServiceProxy extends MediaRoute2Provider
private void onConnectionReady(Connection connection) {
if (mActiveConnection == connection) {
mConnectionReady = true;
if (mPendingDiscoveryPreference != null) {
updateDiscoveryPreference(mPendingDiscoveryPreference);
mPendingDiscoveryPreference = null;
if (mLastDiscoveryPreference != null) {
updateDiscoveryPreference(mLastDiscoveryPreference);
}
}
}