diff options
| author | Arc Wang <arcwang@google.com> | 2019-02-26 15:22:03 +0800 |
|---|---|---|
| committer | Arc Wang <arcwang@google.com> | 2019-02-28 10:29:15 +0800 |
| commit | f53e94929d64fe80e18ff623ba70f551034bba49 (patch) | |
| tree | 255d3ece4f4b77211197a0638da41b60347e024f /core/java | |
| parent | 05ad6df98ae796c2fa58a217d2759b8dad261bf1 (diff) | |
Change Easy Connect intent naming
1. From ACTION_PROCESS_WIFI_EASY_CONNECT_QR_CODE to ACTION_PROCESS_WIFI_EASY_CONNECT_URI
2. Remove EXTRA_QR_CODE and use data Uri to specify Easy Connect bootstrapping information string
Bug: 125874365
Test: atest AvailableIntentsTest
WifiDppChooseSavedWifiNetworkFragmentTest
WifiDppConfiguratorActivityTest
WifiNetworkListFragmentTest
Change-Id: I7ec52c73a2ba1b6b8588f6daa8d73725f115ba0f
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/provider/Settings.java | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 1588718dd8ce..c5b3349dc690 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -496,25 +496,16 @@ public final class Settings { * In some cases, a matching Activity may not exist, so ensure you safeguard * against this by checking WifiManager.isEasyConnectSupported(); * <p> - * Input: - * The following keys in the bundle with their associated value. - * <ul> - * <li>"qrCode": Standard Easy Connect (Wi-Fi DPP) URI bootstrapping information as a - * string.</li> - * </ul> + * Input: The Intent's data URI specifies bootstrapping information for authenticating and + * provisioning the peer, with the "DPP" scheme. * <p> - * Output: Nothing. + * Output: After {@code startActivityForResult}, the callback {@code onActivityResult} will have + * resultCode {@link android.app.Activity#RESULT_OK} if Wi-Fi Easy Connect configuration + * success and the user clicks 'Done' button. */ @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) - public static final String ACTION_PROCESS_WIFI_EASY_CONNECT_QR_CODE = - "android.settings.PROCESS_WIFI_EASY_CONNECT_QR_CODE"; - - /** - * An extra to put in the bundle for {@link #ACTION_PROCESS_WIFI_EASY_CONNECT_QR_CODE} intents. - * It must contain properly formatted Easy Connect (Wi-Fi DPP) URI bootstrapping information for - * the process to proceed. - */ - public static final String EXTRA_QR_CODE = "android.provider.extra.QR_CODE"; + public static final String ACTION_PROCESS_WIFI_EASY_CONNECT_URI = + "android.settings.PROCESS_WIFI_EASY_CONNECT_URI"; /** * Activity Action: Show settings to allow configuration of data and view data usage. |