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

Commit 8b39af58 authored by Etan Cohen's avatar Etan Cohen Committed by android-build-merger
Browse files

Merge "[RTT] COARSE -> FINE permission requirements" into pi-dev 

am: f5435948

Change-Id: I0d5e35ffad577274547c7dd6bd9b2daaa4932b00
parents 004f5370 f5435948

wifi/java/android/net/wifi/rtt/WifiRttManager.java

+3 −3
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package android.net.wifi.rtt;



import static android.Manifest.permission.ACCESS_COARSE_LOCATION;

import static android.Manifest.permission.ACCESS_FINE_LOCATION;

import static android.Manifest.permission.ACCESS_WIFI_STATE;

import static android.Manifest.permission.CHANGE_WIFI_STATE;

import static android.Manifest.permission.LOCATION_HARDWARE;
@@ -109,7 +109,7 @@ public class WifiRttManager { 
     * @param executor The Executor on which to run the callback.

     * @param callback A callback for the result of the ranging request.

     */

    @RequiresPermission(allOf = {ACCESS_COARSE_LOCATION, CHANGE_WIFI_STATE, ACCESS_WIFI_STATE})

    @RequiresPermission(allOf = {ACCESS_FINE_LOCATION, CHANGE_WIFI_STATE, ACCESS_WIFI_STATE})

    public void startRanging(@NonNull RangingRequest request,

            @NonNull @CallbackExecutor Executor executor, @NonNull RangingResultCallback callback) {

        startRanging(null, request, executor, callback);
@@ -128,7 +128,7 @@ public class WifiRttManager { 
     * @hide

     */

    @SystemApi

    @RequiresPermission(allOf = {LOCATION_HARDWARE, ACCESS_COARSE_LOCATION, CHANGE_WIFI_STATE,

    @RequiresPermission(allOf = {LOCATION_HARDWARE, ACCESS_FINE_LOCATION, CHANGE_WIFI_STATE,

            ACCESS_WIFI_STATE})

    public void startRanging(@Nullable WorkSource workSource, @NonNull RangingRequest request,

            @NonNull @CallbackExecutor Executor executor, @NonNull RangingResultCallback callback) {

wifi/java/android/net/wifi/rtt/package.html

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
<ul>

    <li>{@link android.Manifest.permission#ACCESS_WIFI_STATE}</li>

    <li>{@link android.Manifest.permission#CHANGE_WIFI_STATE}</li>

    <li>{@link android.Manifest.permission#ACCESS_COARSE_LOCATION}</li>

    <li>{@link android.Manifest.permission#ACCESS_FINE_LOCATION}</li>

</ul>

<p>Usage of the API is also gated by the device's Location Mode: whether it permits Wi-Fi based

location to be queried.</p>