From e046e8af2abd816e5d4e25093d957a4f1f8d92cf Mon Sep 17 00:00:00 2001
From: Hai Shalom <haishalom@google.com>
Date: Mon, 14 Jan 2019 15:49:59 -0800
Subject: [PATCH] [DPP] Fix usage of "DPP" public API to "Easy Connect"

All DPP public API and constants renamed to use Easy Connect,
which is the WFA public technology name. Update the settings code to use the
new API names.

Bug: 122851551
Test: atest DppManagerTest
Test: act.py -c ../WifiDppConfig.json -tc WifiDppTest
Change-Id: Ib531393a81526c468c978e31f1c62c5022245d55
---
 .../settings/wifi/dpp/WifiDppAddDeviceFragment.java   |  9 +++++----
 .../settings/wifi/dpp/WifiDppEnrolleeActivity.java    | 11 ++++++-----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/com/android/settings/wifi/dpp/WifiDppAddDeviceFragment.java b/src/com/android/settings/wifi/dpp/WifiDppAddDeviceFragment.java
index 0821ec074c2..df20caaef75 100644
--- a/src/com/android/settings/wifi/dpp/WifiDppAddDeviceFragment.java
+++ b/src/com/android/settings/wifi/dpp/WifiDppAddDeviceFragment.java
@@ -45,7 +45,7 @@ public class WifiDppAddDeviceFragment extends WifiDppQrCodeBaseFragment {
     private Button mButtonLeft;
     private Button mButtonRight;
 
-    private class DppStatusCallback extends android.net.wifi.DppStatusCallback {
+    private class EasyConnectStatusCallback extends android.net.wifi.EasyConnectStatusCallback {
         @Override
         public void onEnrolleeSuccess(int newNetworkId) {
             // Do nothing
@@ -65,7 +65,7 @@ public class WifiDppAddDeviceFragment extends WifiDppQrCodeBaseFragment {
 
         @Override
         public void onFailure(int code) {
-            Log.d(TAG, "DppStatusCallback.onFailure " + code);
+            Log.d(TAG, "EasyConnectStatusCallback.onFailure " + code);
 
             // Update fail UI.
             mTitle.setText(R.string.wifi_dpp_could_not_add_device);
@@ -149,8 +149,9 @@ public class WifiDppAddDeviceFragment extends WifiDppQrCodeBaseFragment {
                 ((WifiDppConfiguratorActivity) getActivity()).getWifiNetworkConfig().getNetworkId();
         final WifiManager wifiManager = getContext().getSystemService(WifiManager.class);
 
-        wifiManager.startDppAsConfiguratorInitiator(qrCode, networkId,
-                WifiManager.DPP_NETWORK_ROLE_STA, /* handler */ null, new DppStatusCallback());
+        wifiManager.startEasyConnectAsConfiguratorInitiator(qrCode, networkId,
+                WifiManager.EASY_CONNECT_NETWORK_ROLE_STA, /* handler */ null,
+                new EasyConnectStatusCallback());
     }
 
     // Container Activity must implement this interface
diff --git a/src/com/android/settings/wifi/dpp/WifiDppEnrolleeActivity.java b/src/com/android/settings/wifi/dpp/WifiDppEnrolleeActivity.java
index 3a1b6bce351..66f75fa742c 100644
--- a/src/com/android/settings/wifi/dpp/WifiDppEnrolleeActivity.java
+++ b/src/com/android/settings/wifi/dpp/WifiDppEnrolleeActivity.java
@@ -53,12 +53,13 @@ public class WifiDppEnrolleeActivity extends InstrumentedActivity implements
 
     private FragmentManager mFragmentManager;
 
-    private class DppStatusCallback extends android.net.wifi.DppStatusCallback {
+    private class EasyConnectStatusCallback extends android.net.wifi.EasyConnectStatusCallback {
         @Override
         public void onEnrolleeSuccess(int newNetworkId) {
             // Connect to the new network.
             final WifiManager wifiManager = getSystemService(WifiManager.class);
-            final List<WifiConfiguration> wifiConfigs = wifiManager.getPrivilegedConfiguredNetworks();
+            final List<WifiConfiguration> wifiConfigs =
+                    wifiManager.getPrivilegedConfiguredNetworks();
             for (WifiConfiguration wifiConfig : wifiConfigs) {
                 if (wifiConfig.networkId == newNetworkId) {
                     wifiManager.connect(wifiConfig, WifiDppEnrolleeActivity.this);
@@ -77,7 +78,7 @@ public class WifiDppEnrolleeActivity extends InstrumentedActivity implements
         @Override
         public void onFailure(int code) {
             //TODO(b/122429170): Show DPP enrollee error state UI
-            Log.d(TAG, "DppStatusCallback.onFailure " + code);
+            Log.d(TAG, "EasyConnectStatusCallback.onFailure " + code);
         }
 
         @Override
@@ -147,8 +148,8 @@ public class WifiDppEnrolleeActivity extends InstrumentedActivity implements
     @Override
     public void onScanWifiDppSuccess(WifiQrCode wifiQrCode) {
         final WifiManager wifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE);
-        wifiManager.startDppAsEnrolleeInitiator(wifiQrCode.getQrCode(), /* handler */ null,
-                new DppStatusCallback());
+        wifiManager.startEasyConnectAsEnrolleeInitiator(wifiQrCode.getQrCode(), /* handler */ null,
+                new EasyConnectStatusCallback());
     }
 
     @Override