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

Commit 521eeaef authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Make MediaRouter ignore remembered wifi displays when wifi display is off" into jb-mr2-dev

parents 8881455a 615e413a
Loading
Loading
Loading
Loading
+13 −4
Original line number Diff line number Diff line
@@ -767,10 +767,19 @@ public class MediaRouter {
        boolean wantScan = false;
        boolean blockScan = false;
        WifiDisplay[] oldDisplays = oldStatus != null ?
                oldStatus.getRememberedDisplays() : new WifiDisplay[0];
        WifiDisplay[] newDisplays = newStatus.getRememberedDisplays();
        WifiDisplay[] availableDisplays = newStatus.getAvailableDisplays();
        WifiDisplay activeDisplay = newStatus.getActiveDisplay();
                oldStatus.getRememberedDisplays() : WifiDisplay.EMPTY_ARRAY;
        WifiDisplay[] newDisplays;
        WifiDisplay[] availableDisplays;
        WifiDisplay activeDisplay;

        if (newStatus.getFeatureState() == WifiDisplayStatus.FEATURE_STATE_ON) {
            newDisplays = newStatus.getRememberedDisplays();
            availableDisplays = newStatus.getAvailableDisplays();
            activeDisplay = newStatus.getActiveDisplay();
        } else {
            newDisplays = availableDisplays = WifiDisplay.EMPTY_ARRAY;
            activeDisplay = null;
        }

        for (int i = 0; i < newDisplays.length; i++) {
            final WifiDisplay d = newDisplays[i];