Merge "Swap parameters in QosCallback#registerQosCallback" am: dcc2fb2a19 am: 507df2663e am: 2e744846a0

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628901

Change-Id: Ice84bb2e6d855ed88e7e432cf49739e69c9e01de
This commit is contained in:
Jayachandran Chinnakkannu
2021-03-22 12:30:40 +00:00
committed by Automerger Merge Worker
2 changed files with 6 additions and 6 deletions

View File

@@ -4944,20 +4944,20 @@ public class ConnectivityManager {
* {@link QosCallback#onError(QosCallbackException)}. see: {@link QosCallbackException}.
*
* @param socketInfo the socket information used to match QoS events
* @param callback receives qos events that satisfy socketInfo
* @param executor The executor on which the callback will be invoked. The provided
* {@link Executor} must run callback sequentially, otherwise the order of
* callbacks cannot be guaranteed.
* callbacks cannot be guaranteed.onQosCallbackRegistered
* @param callback receives qos events that satisfy socketInfo
*
* @hide
*/
@SystemApi
public void registerQosCallback(@NonNull final QosSocketInfo socketInfo,
@NonNull final QosCallback callback,
@CallbackExecutor @NonNull final Executor executor) {
@CallbackExecutor @NonNull final Executor executor,
@NonNull final QosCallback callback) {
Objects.requireNonNull(socketInfo, "socketInfo must be non-null");
Objects.requireNonNull(callback, "callback must be non-null");
Objects.requireNonNull(executor, "executor must be non-null");
Objects.requireNonNull(callback, "callback must be non-null");
try {
synchronized (mQosCallbackConnections) {