From e69dc5cc6c8db2fd9656e2293c8b659b20db809c Mon Sep 17 00:00:00 2001 From: Johnson Lu Date: Thu, 17 Jan 2019 09:41:15 +0800 Subject: [PATCH] Check whether the device support DPP for public intent Check PROCESS_WIFI_EASY_CONNECT_QR_CODE intent. Bug: 122331217 Test: manual test Change-Id: I9bc4007f8c01d11a186640e8ef59be6329350dc9 --- .../settings/wifi/dpp/WifiDppConfiguratorActivity.java | 6 +++++- src/com/android/settings/wifi/dpp/WifiDppUtils.java | 8 ++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java b/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java index 51777c59518..e28e0e55209 100644 --- a/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java +++ b/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java @@ -142,7 +142,11 @@ public class WifiDppConfiguratorActivity extends InstrumentedActivity implements case ACTION_PROCESS_WIFI_DPP_QR_CODE: String qrCode = intent.getStringExtra(WifiDppUtils.EXTRA_QR_CODE); mWifiDppQrCode = getValidWifiDppQrCodeOrNull(qrCode); - if (mWifiDppQrCode == null) { + final boolean isDppSupported = WifiDppUtils.isWifiDppEnabled(this); + if (!isDppSupported) { + Log.d(TAG, "Device doesn't support Wifi DPP"); + } + if (mWifiDppQrCode == null || !isDppSupported) { cancelActivity = true; } else { showChooseSavedWifiNetworkFragment(/* addToBackStack */ false); diff --git a/src/com/android/settings/wifi/dpp/WifiDppUtils.java b/src/com/android/settings/wifi/dpp/WifiDppUtils.java index 0205ec1dc13..ef7a1c9fdc2 100644 --- a/src/com/android/settings/wifi/dpp/WifiDppUtils.java +++ b/src/com/android/settings/wifi/dpp/WifiDppUtils.java @@ -78,6 +78,14 @@ public class WifiDppUtils { com.android.settings.core.FeatureFlags.WIFI_SHARING); } + /** + * Returns whether the device support WiFi DPP. + */ + public static boolean isWifiDppEnabled(Context context) { + final WifiManager manager = context.getSystemService(WifiManager.class); + return manager.isEasyConnectSupported(); + } + /** * Returns an intent to launch QR code scanner for Wi-Fi DPP enrollee. *