am 919559d4: Merge "wifi-display: disable WFD IE when Wifi display is turned off" into klp-dev

* commit '919559d447a47257531fbe47e32cd9f4889457ea':
  wifi-display: disable WFD IE when Wifi display is turned off
This commit is contained in:
Chong Zhang
2013-09-04 15:11:31 -07:00
committed by Android Git Automerger

View File

@@ -286,6 +286,25 @@ final class WifiDisplayController implements DumpUtils.Dump {
}
} else {
// WFD should be disabled.
if (mWfdEnabled || mWfdEnabling) {
WifiP2pWfdInfo wfdInfo = new WifiP2pWfdInfo();
wfdInfo.setWfdEnabled(false);
mWifiP2pManager.setWFDInfo(mWifiP2pChannel, wfdInfo, new ActionListener() {
@Override
public void onSuccess() {
if (DEBUG) {
Slog.d(TAG, "Successfully set WFD info.");
}
}
@Override
public void onFailure(int reason) {
if (DEBUG) {
Slog.d(TAG, "Failed to set WFD info with reason " + reason + ".");
}
}
});
}
mWfdEnabling = false;
mWfdEnabled = false;
reportFeatureState();