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

Merge "[NAN] Add COARSE_LOCATION permission check to NAN discovery"

Browse Source
This commit is contained in:
Etan Cohen
2016-10-06 02:06:36 +00:00
committed by Gerrit Code Review
parent 5d49f802a4 2a4c81b7a7
commit ee1e81ec5d
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wifi/java/android/net/wifi/nan/WifiNanSession.java
View File

@@ -113,6 +113,8 @@ public class WifiNanSession {
* An application must use the {@link WifiNanDiscoveryBaseSession#destroy()} to * An application must use the {@link WifiNanDiscoveryBaseSession#destroy()} to
* terminate the publish discovery session once it isn't needed. This will free * terminate the publish discovery session once it isn't needed. This will free
* resources as well terminate any on-air transmissions. * resources as well terminate any on-air transmissions.
* <p>The application must have the {@link android.Manifest.permission#ACCESS_COARSE_LOCATION}
* permission to start a publish discovery session.
* *
* @param handler The Handler on whose thread to execute the callbacks of the {@code * @param handler The Handler on whose thread to execute the callbacks of the {@code
* callback} object. If a null is provided then the application's main thread will be used. * callback} object. If a null is provided then the application's main thread will be used.
@@ -156,6 +158,8 @@ public class WifiNanSession {
* An application must use the {@link WifiNanDiscoveryBaseSession#destroy()} to * An application must use the {@link WifiNanDiscoveryBaseSession#destroy()} to
* terminate the subscribe discovery session once it isn't needed. This will free * terminate the subscribe discovery session once it isn't needed. This will free
* resources as well terminate any on-air transmissions. * resources as well terminate any on-air transmissions.
* <p>The application must have the {@link android.Manifest.permission#ACCESS_COARSE_LOCATION}
* permission to start a subscribe discovery session.
* *
* @param handler The Handler on whose thread to execute the callbacks of the {@code * @param handler The Handler on whose thread to execute the callbacks of the {@code
* callback} object. If a null is provided then the application's main thread will be used. * callback} object. If a null is provided then the application's main thread will be used.