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

Commit 006f6dfc authored by Jeff Brown's avatar Jeff Brown Committed by Android Git Automerger
Browse files

am 4eaba60f: am df409231: Merge "Update wifi display device name when renamed." into jb-mr1-dev 

* commit '4eaba60f':
  Update wifi display device name when renamed.
parents 0b450a74 4eaba60f

services/java/com/android/server/display/WifiDisplayAdapter.java

+12 −1
Original line number Diff line number Diff line
@@ -198,6 +198,12 @@ final class WifiDisplayAdapter extends DisplayAdapter { 
            updateRememberedDisplaysLocked();

            scheduleStatusChangedBroadcastLocked();

        }



        if (mActiveDisplay != null && mActiveDisplay.getDeviceAddress().equals(address)

                && mDisplayDevice != null) {

            mDisplayDevice.setNameLocked(mActiveDisplay.getFriendlyDisplayName());

            sendDisplayDeviceEventLocked(mDisplayDevice, DISPLAY_DEVICE_EVENT_CHANGED);

        }

    }



    public void requestForgetLocked(String address) {
@@ -397,7 +403,7 @@ final class WifiDisplayAdapter extends DisplayAdapter { 
    };



    private final class WifiDisplayDevice extends DisplayDevice {

        private final String mName;

        private String mName;

        private final int mWidth;

        private final int mHeight;

        private final float mRefreshRate;
@@ -423,6 +429,11 @@ final class WifiDisplayAdapter extends DisplayAdapter { 
            sendTraversalRequestLocked();

        }



        public void setNameLocked(String name) {

            mName = name;

            mInfo = null;

        }



        @Override

        public void performTraversalInTransactionLocked() {

            setSurfaceInTransactionLocked(mSurface);