Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dfe107df authored by Santiago Seifert's avatar Santiago Seifert
Browse files

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
parent 7799b5d9

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

+14 −11
Original line number Diff line number Diff line
@@ -231,18 +231,21 @@ final class MediaRoute2ProviderServiceProxy extends MediaRoute2Provider 
    }



    private boolean shouldBind() {

        if (mRunning) {

            boolean shouldBind =

                    mLastDiscoveryPreference != null

                            && !mLastDiscoveryPreference.getPreferredFeatures().isEmpty();

            if (mIsSelfScanOnlyProvider) {

                shouldBind &= mLastDiscoveryPreferenceIncludesThisPackage;

        if (!mRunning) {

            return false;

        }

            shouldBind |= mIsManagerScanning;

            shouldBind |= !getSessionInfos().isEmpty();

            return shouldBind;

        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;

        }

        return false;

        boolean anAppIsScanning =

                mLastDiscoveryPreference != null

                        && !mLastDiscoveryPreference.getPreferredFeatures().isEmpty();

        return anAppIsScanning

                && (mLastDiscoveryPreferenceIncludesThisPackage || !mIsSelfScanOnlyProvider);

    }



    private void bind() {