Merge "Allow SetupWizard to do WiFi scans if location off"

am: c98b34bdce

Change-Id: Ibfd31e4ce200479201abb14c28d883b556a62b6b
This commit is contained in:
Svetoslav Ganov
2016-10-13 20:15:38 +00:00
committed by android-build-merger

View File

@@ -3035,7 +3035,7 @@
<!-- @SystemApi Allows access to MAC addresses of WiFi and Bluetooth peer devices. <!-- @SystemApi Allows access to MAC addresses of WiFi and Bluetooth peer devices.
@hide --> @hide -->
<permission android:name="android.permission.PEERS_MAC_ADDRESS" <permission android:name="android.permission.PEERS_MAC_ADDRESS"
android:protectionLevel="signature" /> android:protectionLevel="signature|setup" />
<!-- Allows the Nfc stack to dispatch Nfc messages to applications. Applications <!-- Allows the Nfc stack to dispatch Nfc messages to applications. Applications
can use this permission to ensure incoming Nfc messages are from the Nfc stack can use this permission to ensure incoming Nfc messages are from the Nfc stack