commit 1c947220899a8fdd63d6264fd863fc030197401f
author Hai Shalom <haishalom@google.com> Fri Apr 03 15:58:34 2020 -0700
committer Hai Shalom <haishalom@google.com> Fri Apr 03 23:15:02 2020 +0000
tree 2df8cc3c605ee9835f661e59647246d51074b130
parent 31f148388fb04d8fb1bcd886409bc4f56ce84538

[wpa_supplicant] Disable CONFIG_DPP2

Disable DPP R2 support in wpa_supplicant because the specification
is not finalized yet and subject to change.

Note: ACTS configuration file must set dpp_r1_test_only to "True".

Bug: 153199405
Test: act.py -c ../WifiDppConfig.json -tc WifiDppTest
Test: atest -c EasyConnectStatusCallbackTest
Change-Id: I903dd97f8d7b4966aa00819dd8cff885b039ba3d

wpa_supplicant/android.config

diff --git a/wpa_supplicant/android.config b/wpa_supplicant/android.config
index d05141f..acefc92 100644
--- a/wpa_supplicant/android.config
+++ b/wpa_supplicant/android.config
@@ -535,12 +535,10 @@
 #CONFIG_BGSCAN_LEARN=y
 
 # Opportunistic Wireless Encryption (OWE)
-# Experimental implementation of draft-harkins-owe-07.txt
 CONFIG_OWE=y
 
-# Easy Connect (Device Provisioning Protocol - DPP R1 and R2)
+# Easy Connect (Device Provisioning Protocol - DPP R1)
 CONFIG_DPP=y
-CONFIG_DPP2=y
 
 # WPA3-Personal (SAE)
 CONFIG_SAE=y