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

Commit ad7cc9e6 authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am 66104e1e: am 521eeaef: Merge "Make MediaRouter ignore remembered wifi... 

am 66104e1e: am 521eeaef: Merge "Make MediaRouter ignore remembered wifi displays when wifi display is off" into jb-mr2-dev

* commit '66104e1e':
  Make MediaRouter ignore remembered wifi displays when wifi display is off
parents 0f3e023b 66104e1e

media/java/android/media/MediaRouter.java

+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];