Revert "Check if dual p2p is supported"

This reverts commit e02b0ae8ee5480ee74455785f2118a8c231596b2.

Reason for revert: punting feature

Change-Id: I783134272aedccc00da532ed8cb29dfadb529e99
Bug: 215045910
Test: atest com.android.server.wifi

3 files changed, 0 insertions, 28 deletions

diff --git a/flags/wifi_flags.aconfig b/flags/wifi_flags.aconfig
index e914e9d225..ae486eec0f 100644
--- a/flags/wifi_flags.aconfig
+++ b/flags/wifi_flags.aconfig
@@ -17,14 +17,6 @@ flag {
 }
 
 flag {
-    name: "p2p_dual"
-    namespace: "wifi"
-    description: "Control the dual P2P group feature"
-    bug: "296063280"
-    is_fixed_read_only: true
-}
-
-flag {
     name: "delay_save_to_store"
     namespace: "wifi"
     description: "Control the feature delay the save to store in batch to reduce the blocking time"
diff --git a/service/java/com/android/server/wifi/p2p/WifiP2pNative.java b/service/java/com/android/server/wifi/p2p/WifiP2pNative.java
index 068a54b672..9149ff3b4d 100644
--- a/service/java/com/android/server/wifi/p2p/WifiP2pNative.java
+++ b/service/java/com/android/server/wifi/p2p/WifiP2pNative.java
@@ -41,7 +41,6 @@ import android.os.Handler;
 import android.os.WorkSource;
 import android.text.TextUtils;
 import android.util.Log;
-import android.util.SparseArray;
 
 import androidx.annotation.Keep;
 
@@ -1102,18 +1101,6 @@ public class WifiP2pNative {
     }
 
     /**
-     * Returns whether P2P + P2P concurrency is supported or not.
-     */
-    public boolean isP2pP2pConcurrencySupported() {
-        synchronized (mLock) {
-            return mWifiVendorHal.canDeviceSupportCreateTypeCombo(
-                    new SparseArray<Integer>() {{
-                        put(HDM_CREATE_IFACE_P2P, 2);
-                    }});
-        }
-    }
-
-    /**
      * Configure the IP addresses in supplicant for P2P GO to provide the IP address to
      * client in EAPOL handshake. Refer Wi-Fi P2P Technical Specification v1.7 - Section  4.2.8
      * IP Address Allocation in EAPOL-Key Frames (4-Way Handshake) for more details.
diff --git a/service/java/com/android/server/wifi/p2p/WifiP2pServiceImpl.java b/service/java/com/android/server/wifi/p2p/WifiP2pServiceImpl.java
index a7fcb4328d..9f8bf56366 100644
--- a/service/java/com/android/server/wifi/p2p/WifiP2pServiceImpl.java
+++ b/service/java/com/android/server/wifi/p2p/WifiP2pServiceImpl.java
@@ -1430,12 +1430,6 @@ public class WifiP2pServiceImpl extends IWifiP2pManager.Stub {
                 != PackageManager.PERMISSION_DENIED;
     }
 
-    private boolean isDualP2pSupported() {
-        return mFeatureFlags.p2pDual()
-                && mFeatureFlags.p2pOwnership()
-                && mWifiNative.isP2pP2pConcurrencySupported();
-    }
-
     @Override
     protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
         if (mContext.checkCallingOrSelfPermission(android.Manifest.permission.DUMP)
@@ -1458,7 +1452,6 @@ public class WifiP2pServiceImpl extends IWifiP2pManager.Stub {
         pw.println("mClientInfoList " + mClientInfoList.size());
         pw.println("mActiveClients " + mActiveClients);
         pw.println("mPeerAuthorizingTimestamp" + mPeerAuthorizingTimestamp);
-        pw.println("isDualP2pSupported" + isDualP2pSupported());
         pw.println();
 
         final IIpClient ipClient = mIpClient;