Simplify MediaRoute2ProviderServiceProxy#shouldBind
In preparation for changes in the conditions that would
introduce further nesting.
Bug: b/263520343
Test: presubmit. This is a non-functional change.
Change-Id: I1271c39e8bfd65836f6cff4a4216d5d293a0308f
diff --git a/services/core/java/com/android/server/media/MediaRoute2ProviderServiceProxy.java b/services/core/java/com/android/server/media/MediaRoute2ProviderServiceProxy.java
index ae889d8..21e7bef 100644
--- a/services/core/java/com/android/server/media/MediaRoute2ProviderServiceProxy.java
+++ b/services/core/java/com/android/server/media/MediaRoute2ProviderServiceProxy.java
@@ -231,18 +231,21 @@
}
private boolean shouldBind() {
- if (mRunning) {
- boolean shouldBind =
- mLastDiscoveryPreference != null
- && !mLastDiscoveryPreference.getPreferredFeatures().isEmpty();
- if (mIsSelfScanOnlyProvider) {
- shouldBind &= mLastDiscoveryPreferenceIncludesThisPackage;
- }
- shouldBind |= mIsManagerScanning;
- shouldBind |= !getSessionInfos().isEmpty();
- return shouldBind;
+ if (!mRunning) {
+ return false;
}
- return false;
+ if (!getSessionInfos().isEmpty() || mIsManagerScanning) {
+ // We bind if any manager is scanning (regardless of whether an app is scanning) to give
+ // the opportunity for providers to publish routing sessions that were established
+ // directly between the app and the provider (typically via AndroidX MediaRouter). See
+ // b/176774510#comment20 for more information.
+ return true;
+ }
+ boolean anAppIsScanning =
+ mLastDiscoveryPreference != null
+ && !mLastDiscoveryPreference.getPreferredFeatures().isEmpty();
+ return anAppIsScanning
+ && (mLastDiscoveryPreferenceIncludesThisPackage || !mIsSelfScanOnlyProvider);
}
private void bind() {