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

Merge "Allow SetupWizard to do WiFi scans if location off" am: c98b34bdce

Browse Source 
am: 72510e6244

Change-Id: Ib4468dc91eae1f6c26cdde4b70e911aa38696e27
This commit is contained in:
Svetoslav Ganov
2016-10-13 20:20:06 +00:00
committed by android-build-merger
parent 4c5141b98b 72510e6244
commit cf146edb32
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/res/AndroidManifest.xml
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