Merge "Add an action to launch scanning settings" into pi-dev

am: 4af3d1a4a4

Change-Id: I8e15c04b225ceb2792a2ca2d41c405922c02e482
This commit is contained in:
Lifu Tang
2018-04-14 19:47:11 -07:00
committed by android-build-merger

View File

@@ -141,6 +141,22 @@ public final class Settings {
public static final String ACTION_LOCATION_SOURCE_SETTINGS =
"android.settings.LOCATION_SOURCE_SETTINGS";
/**
* Activity Action: Show scanning settings to allow configuration of Wi-Fi
* and Bluetooth scanning settings.
* <p>
* In some cases, a matching Activity may not exist, so ensure you
* safeguard against this.
* <p>
* Input: Nothing.
* <p>
* Output: Nothing.
* @hide
*/
@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
public static final String ACTION_LOCATION_SCANNING_SETTINGS =
"android.settings.LOCATION_SCANNING_SETTINGS";
/**
* Activity Action: Show settings to allow configuration of users.
* <p>