Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97b3d995 authored by Etan Cohen's avatar Etan Cohen Committed by android-build-merger
Browse files

Merge "[NAN] Add COARSE_LOCATION permission check to NAN discovery" am: ee1e81ec 

am: c5101c52

Change-Id: Ib3d02752745845d4966965c98dac9d47e0551d6d
parents d7dc327b c5101c52

wifi/java/android/net/wifi/nan/WifiNanSession.java

+4 −0
Original line number Diff line number Diff line
@@ -113,6 +113,8 @@ public class WifiNanSession { 
     *      An application must use the {@link WifiNanDiscoveryBaseSession#destroy()} to

     *      terminate the publish discovery session once it isn't needed. This will free

     *      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

     * 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

     *      terminate the subscribe discovery session once it isn't needed. This will free

     *      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

     * callback} object. If a null is provided then the application's main thread will be used.