From fa0aeee678700b7f9865c06ec45d9d3a6e31089f Mon Sep 17 00:00:00 2001
From: Jimmy Chen <jimmycmchen@google.com>
Date: Sat, 12 Jun 2021 23:01:42 +0800
Subject: [PATCH] wfd: release wifi p2p resource on disconnecting from WFD
 service.

Once WFD is enabled, it will keep wifi p2p resource even if WFD service
is disabled. In new interface priority scheme, this will block any
3rd-app NAN request because WFD is a system service.

Bug: 184504089
Test: execute "adb shell setprop persist.debug.wfd.enable 1"
      check p2p resource is released after calling disconnect()
Change-Id: Ic1057667e7e4bfbb2b7c44d8949043e62d145356
---
 .../com/android/server/display/WifiDisplayController.java    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/services/core/java/com/android/server/display/WifiDisplayController.java b/services/core/java/com/android/server/display/WifiDisplayController.java
index a7e1a2876f818..6db75eb80aea3 100644
--- a/services/core/java/com/android/server/display/WifiDisplayController.java
+++ b/services/core/java/com/android/server/display/WifiDisplayController.java
@@ -550,6 +550,11 @@ final class WifiDisplayController implements DumpUtils.Dump {
 
     private void disconnect() {
         mDesiredDevice = null;
+        mWifiP2pManager = null;
+        if (null != mWifiP2pChannel) {
+            mWifiP2pChannel.close();
+            mWifiP2pChannel = null;
+        }
         updateConnection();
     }