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

2013-09-04 22:06:45 +00:00
parent 171c63db92 72193e1f32
commit 919559d447
1 changed files with 19 additions and 0 deletions
--- a/services/java/com/android/server/display/WifiDisplayController.java
+++ b/services/java/com/android/server/display/WifiDisplayController.java
@@ -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();