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

[RTT2] Add WorkSource APIs to request/cancel ranging ops

Browse Source 
Add System API to manage ranging operations. Use WorkSource to specify
the actual source of the operation. Add cancel API (using WorkSource)
to allow cleaning-up (proxying binder death).

Bug: 65015291
Test: unit tests and integration tests
Change-Id: I98f762df8b1d262d1f386963e7e2ff3569b001d5
This commit is contained in:
Etan Cohen
2017-10-31 16:01:32 -07:00
parent 8c07286d2c
commit 4250e786ad
3 changed files with 57 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wifi/java/android/net/wifi/rtt/IWifiRttManager.aidl
View File

@@ -16,6 +16,8 @@
package android.net.wifi.rtt;
import android.os.WorkSource;
import android.net.wifi.rtt.IRttCallback;
import android.net.wifi.rtt.RangingRequest;
@@ -25,6 +27,7 @@ import android.net.wifi.rtt.RangingRequest;
interface IWifiRttManager
{
boolean isAvailable();
void startRanging(in IBinder binder, in String callingPackage, in RangingRequest request,
in IRttCallback callback);
void startRanging(in IBinder binder, in String callingPackage, in WorkSource workSource,
in RangingRequest request, in IRttCallback callback);
void cancelRanging(in WorkSource workSource);
}

51
wifi/java/android/net/wifi/rtt/WifiRttManager.java
View File

@@ -3,16 +3,19 @@ package android.net.wifi.rtt;
import static android.Manifest.permission.ACCESS_COARSE_LOCATION;
import static android.Manifest.permission.ACCESS_WIFI_STATE;
import static android.Manifest.permission.CHANGE_WIFI_STATE;
import static android.Manifest.permission.LOCATION_HARDWARE;
import android.annotation.Nullable;
import android.annotation.RequiresPermission;
import android.annotation.SdkConstant;
import android.annotation.SystemApi;
import android.annotation.SystemService;
import android.content.Context;
import android.os.Binder;
import android.os.Handler;
import android.os.Looper;
import android.os.RemoteException;
import android.os.WorkSource;
import android.util.Log;
import java.util.List;
@@ -94,21 +97,63 @@ public class WifiRttManager {
@RequiresPermission(allOf = {ACCESS_COARSE_LOCATION, CHANGE_WIFI_STATE, ACCESS_WIFI_STATE})
public void startRanging(RangingRequest request, RangingResultCallback callback,
@Nullable Handler handler) {
startRanging(null, request, callback, handler);
}
/**
* Initiate a request to range to a set of devices specified in the {@link RangingRequest}.
* Results will be returned in the {@link RangingResultCallback} set of callbacks.
*
* @param workSource A mechanism to specify an alternative work-source for the request.
* @param request A request specifying a set of devices whose distance measurements are
* requested.
* @param callback A callback for the result of the ranging request.
* @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.
*
* @hide (@SystemApi)
*/
@RequiresPermission(allOf = {LOCATION_HARDWARE, ACCESS_COARSE_LOCATION, CHANGE_WIFI_STATE,
ACCESS_WIFI_STATE})
public void startRanging(@Nullable WorkSource workSource, RangingRequest request,
RangingResultCallback callback, @Nullable Handler handler) {
if (VDBG) {
Log.v(TAG, "startRanging: request=" + request + ", callback=" + callback + ", handler="
+ handler);
Log.v(TAG, "startRanging: workSource=" + workSource + ", request=" + request
+ ", callback=" + callback + ", handler=" + handler);
}
Looper looper = (handler == null) ? Looper.getMainLooper() : handler.getLooper();
Binder binder = new Binder();
try {
mService.startRanging(binder, mContext.getOpPackageName(), request,
mService.startRanging(binder, mContext.getOpPackageName(), workSource, request,
new RttCallbackProxy(looper, callback));
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
}
/**
* Cancel all ranging requests for the specified work sources. The requests have been requested
* using {@link #startRanging(WorkSource, RangingRequest, RangingResultCallback, Handler)}.
*
* @param workSource The work-sources of the requesters.
*
* @hide (@SystemApi)
*/
@RequiresPermission(allOf = {LOCATION_HARDWARE})
public void cancelRanging(WorkSource workSource) {
if (VDBG) {
Log.v(TAG, "cancelRanging: workSource=" + workSource);
}
try {
mService.cancelRanging(workSource);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
}
private static class RttCallbackProxy extends IRttCallback.Stub {
private final Handler mHandler;
private final RangingResultCallback mCallback;

8
wifi/tests/src/android/net/wifi/rtt/WifiRttManagerTest.java
View File

@@ -85,8 +85,8 @@ public class WifiRttManagerTest {
// verify ranging request passed to service
mDut.startRanging(request, callbackMock, mMockLooperHandler);
verify(mockRttService).startRanging(any(IBinder.class), eq(packageName), eq(request),
callbackCaptor.capture());
verify(mockRttService).startRanging(any(IBinder.class), eq(packageName), eq(null),
eq(request), callbackCaptor.capture());
// service calls back with success
callbackCaptor.getValue().onRangingResults(results);
@@ -109,8 +109,8 @@ public class WifiRttManagerTest {
// verify ranging request passed to service
mDut.startRanging(request, callbackMock, mMockLooperHandler);
verify(mockRttService).startRanging(any(IBinder.class), eq(packageName), eq(request),
callbackCaptor.capture());
verify(mockRttService).startRanging(any(IBinder.class), eq(packageName), eq(null),
eq(request), callbackCaptor.capture());
// service calls back with failure code
callbackCaptor.getValue().onRangingFailure(failureCode);