Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Change Easy Connect intent naming"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-03-03 16:17:34 +00:00
committed by Android (Google) Code Review
parent a2c829c185 f53e94929d
commit a1f8604603
2 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/current.txt
View File

@@ -38834,7 +38834,7 @@ package android.provider {
field public static final String ACTION_NOTIFICATION_POLICY_ACCESS_SETTINGS = "android.settings.NOTIFICATION_POLICY_ACCESS_SETTINGS";
field public static final String ACTION_PRINT_SETTINGS = "android.settings.ACTION_PRINT_SETTINGS";
field public static final String ACTION_PRIVACY_SETTINGS = "android.settings.PRIVACY_SETTINGS";
field public static final String ACTION_PROCESS_WIFI_EASY_CONNECT_QR_CODE = "android.settings.PROCESS_WIFI_EASY_CONNECT_QR_CODE";
field public static final String ACTION_PROCESS_WIFI_EASY_CONNECT_URI = "android.settings.PROCESS_WIFI_EASY_CONNECT_URI";
field public static final String ACTION_QUICK_LAUNCH_SETTINGS = "android.settings.QUICK_LAUNCH_SETTINGS";
field public static final String ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS = "android.settings.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS";
field public static final String ACTION_REQUEST_SET_AUTOFILL_SERVICE = "android.settings.REQUEST_SET_AUTOFILL_SERVICE";
@@ -38868,7 +38868,6 @@ package android.provider {
field public static final String EXTRA_DO_NOT_DISTURB_MODE_ENABLED = "android.settings.extra.do_not_disturb_mode_enabled";
field public static final String EXTRA_DO_NOT_DISTURB_MODE_MINUTES = "android.settings.extra.do_not_disturb_mode_minutes";
field public static final String EXTRA_INPUT_METHOD_ID = "input_method_id";
field public static final String EXTRA_QR_CODE = "android.provider.extra.QR_CODE";
field public static final String EXTRA_SUB_ID = "android.provider.extra.SUB_ID";
field public static final String INTENT_CATEGORY_USAGE_ACCESS_CONFIG = "android.intent.category.USAGE_ACCESS_CONFIG";
field public static final String METADATA_USAGE_ACCESS_REASON = "android.settings.metadata.USAGE_ACCESS_REASON";

23
core/java/android/provider/Settings.java
View File

@@ -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.