Merge "[RTT] Replace Handler with Executor in public APIs" (2094d9d3) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -28551,7 +28551,7 @@ package android.net.wifi.rtt {

		public class WifiRttManager {
		method public boolean isAvailable();
		method public void startRanging(android.net.wifi.rtt.RangingRequest, android.net.wifi.rtt.RangingResultCallback, android.os.Handler);
		method public void startRanging(android.net.wifi.rtt.RangingRequest, java.util.concurrent.Executor, android.net.wifi.rtt.RangingResultCallback);
		field public static final java.lang.String ACTION_WIFI_RTT_STATE_CHANGED = "android.net.wifi.rtt.action.WIFI_RTT_STATE_CHANGED";
		}

api/system-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -3564,7 +3564,7 @@ package android.net.wifi.rtt {

		public class WifiRttManager {
		method public void cancelRanging(android.os.WorkSource);
		method public void startRanging(android.os.WorkSource, android.net.wifi.rtt.RangingRequest, android.net.wifi.rtt.RangingResultCallback, android.os.Handler);
		method public void startRanging(android.os.WorkSource, android.net.wifi.rtt.RangingRequest, java.util.concurrent.Executor, android.net.wifi.rtt.RangingResultCallback);
		}

		}

wifi/java/android/net/wifi/RttManager.java

+8 −4

Original line number	Diff line number	Diff line
		@@ -12,7 +12,6 @@ import android.net.wifi.rtt.RangingRequest;
		import android.net.wifi.rtt.RangingResult;
		import android.net.wifi.rtt.RangingResultCallback;
		import android.net.wifi.rtt.WifiRttManager;
		import android.os.Handler;
		import android.os.Parcel;
		import android.os.Parcelable;
		import android.os.SystemClock;
		@@ -933,7 +932,8 @@ public class RttManager {
		* Request to start an RTT ranging
		* <p>
		* This method is deprecated. Please use the
		* {@link WifiRttManager#startRanging(RangingRequest, RangingResultCallback, Handler)} API.
		* {@link WifiRttManager#startRanging(RangingRequest, java.util.concurrent.Executor, RangingResultCallback)}
		* API.
		*
		* @param params -- RTT request Parameters
		* @param listener -- Call back to inform RTT result
		@@ -969,7 +969,9 @@ public class RttManager {
		android.net.wifi.rtt.ResponderConfig.fromScanResult(reconstructed));
		}
		try {
		mNewService.startRanging(builder.build(), new RangingResultCallback() {
		mNewService.startRanging(builder.build(),
		mContext.getMainExecutor(),
		new RangingResultCallback() {
		@Override
		public void onRangingFailure(int code) {
		int localCode = REASON_UNSPECIFIED;
		@@ -1000,7 +1002,7 @@ public class RttManager {
		}
		listener.onSuccess(legacyResults);
		}
		}, null);
		});
		} catch (IllegalArgumentException e) {
		Log.e(TAG, "startRanging: invalid arguments - " + e);
		listener.onFailure(REASON_INVALID_REQUEST, e.getMessage());
		@@ -1191,6 +1193,7 @@ public class RttManager {
		public static final int CMD_OP_REG_BINDER = BASE + 9;

		private final WifiRttManager mNewService;
		private final Context mContext;
		private RttCapabilities mRttCapabilities;

		/**
		@@ -1204,6 +1207,7 @@ public class RttManager {
		*/
		public RttManager(Context context, WifiRttManager service) {
		mNewService = service;
		mContext = context;

		boolean rttSupported = context.getPackageManager().hasSystemFeature(
		PackageManager.FEATURE_WIFI_RTT);

wifi/java/android/net/wifi/rtt/RangingRequest.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@ import java.util.StringJoiner;
		* Defines the ranging request to other devices. The ranging request is built using
		* {@link RangingRequest.Builder}.
		* A ranging request is executed using
		* {@link WifiRttManager#startRanging(RangingRequest, RangingResultCallback, Handler)}.
		* {@link WifiRttManager#startRanging(RangingRequest, java.util.concurrent.Executor, RangingResultCallback)}.
		* <p>
		* The ranging request is a batch request - specifying a set of devices (specified using
		* {@link RangingRequest.Builder#addAccessPoint(ScanResult)} and

wifi/java/android/net/wifi/rtt/RangingResult.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -34,8 +34,8 @@ import java.util.Objects;

		/**
		* Ranging result for a request started by
		* {@link WifiRttManager#startRanging(RangingRequest, RangingResultCallback, Handler)}. Results are
		* returned in {@link RangingResultCallback#onRangingResults(List)}.
		* {@link WifiRttManager#startRanging(RangingRequest, java.util.concurrent.Executor, RangingResultCallback)}.
		* Results are returned in {@link RangingResultCallback#onRangingResults(List)}.
		* <p>
		* A ranging result is the distance measurement result for a single device specified in the
		* {@link RangingRequest}.