Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'df409231a75c8b2ae976af66c0baec99b280aa33':
  Update wifi display device name when renamed.
This commit is contained in:
Jeff Brown
2012-10-15 17:23:39 -07:00
committed by Android Git Automerger
parent 4a533efae3 df409231a7
commit 4eaba60fff
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/java/com/android/server/display/WifiDisplayAdapter.java
View File

@@ -198,6 +198,12 @@ final class WifiDisplayAdapter extends DisplayAdapter {
updateRememberedDisplaysLocked(); updateRememberedDisplaysLocked();
scheduleStatusChangedBroadcastLocked(); 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) { public void requestForgetLocked(String address) {
@@ -397,7 +403,7 @@ final class WifiDisplayAdapter extends DisplayAdapter {
}; };
private final class WifiDisplayDevice extends DisplayDevice { private final class WifiDisplayDevice extends DisplayDevice {
private final String mName; private String mName;
private final int mWidth; private final int mWidth;
private final int mHeight; private final int mHeight;
private final float mRefreshRate; private final float mRefreshRate;
@@ -423,6 +429,11 @@ final class WifiDisplayAdapter extends DisplayAdapter {
sendTraversalRequestLocked(); sendTraversalRequestLocked();
} }
public void setNameLocked(String name) {
mName = name;
mInfo = null;
}
@Override @Override
public void performTraversalInTransactionLocked() { public void performTraversalInTransactionLocked() {
setSurfaceInTransactionLocked(mSurface); setSurfaceInTransactionLocked(mSurface);