[API] Add Offload Callback API
go/presence_api_u Test: -m Ignore-AOSP-First: nearby_not_in_aosp_yet Bug: 265353983 Change-Id: Ie00a1bd5bcdf42d7b4678a3ffbaf18ebfbe735e6
This commit is contained in:
parent
9afce39c43
commit
b90b2015db
6 changed files with 96 additions and 0 deletions
|
|
@ -262,6 +262,7 @@ package android.nearby {
|
|||
|
||||
public class NearbyManager {
|
||||
method public static boolean isFastPairScanEnabled(@NonNull android.content.Context);
|
||||
method public void queryOffloadScanSupport(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Boolean>);
|
||||
method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public static void setFastPairScanEnabled(@NonNull android.content.Context, boolean);
|
||||
method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_ADVERTISE, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public void startBroadcast(@NonNull android.nearby.BroadcastRequest, @NonNull java.util.concurrent.Executor, @NonNull android.nearby.BroadcastCallback);
|
||||
method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_SCAN, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public int startScan(@NonNull android.nearby.ScanRequest, @NonNull java.util.concurrent.Executor, @NonNull android.nearby.ScanCallback);
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@ import android.nearby.IBroadcastListener;
|
|||
import android.nearby.IScanListener;
|
||||
import android.nearby.BroadcastRequestParcelable;
|
||||
import android.nearby.ScanRequest;
|
||||
import android.nearby.aidl.IOffloadCallback;
|
||||
|
||||
/**
|
||||
* Interface for communicating with the nearby services.
|
||||
|
|
@ -37,4 +38,6 @@ interface INearbyManager {
|
|||
in IBroadcastListener callback, String packageName, @nullable String attributionTag);
|
||||
|
||||
void stopBroadcast(in IBroadcastListener callback, String packageName, @nullable String attributionTag);
|
||||
|
||||
void queryOffloadScanSupport(in IOffloadCallback callback) ;
|
||||
}
|
||||
|
|
@ -26,6 +26,7 @@ import android.annotation.SuppressLint;
|
|||
import android.annotation.SystemApi;
|
||||
import android.annotation.SystemService;
|
||||
import android.content.Context;
|
||||
import android.nearby.aidl.IOffloadCallback;
|
||||
import android.os.RemoteException;
|
||||
import android.provider.Settings;
|
||||
import android.util.Log;
|
||||
|
|
@ -37,6 +38,7 @@ import java.lang.ref.WeakReference;
|
|||
import java.util.Objects;
|
||||
import java.util.WeakHashMap;
|
||||
import java.util.concurrent.Executor;
|
||||
import java.util.function.Consumer;
|
||||
|
||||
/**
|
||||
* This class provides a way to perform Nearby related operations such as scanning, broadcasting
|
||||
|
|
@ -267,6 +269,22 @@ public class NearbyManager {
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Query if offload scan is available in a device. The query is asynchronous and
|
||||
* result is called back in {@link Consumer}, which is set to true if offload is supported.
|
||||
*
|
||||
* @param executor the callback will take place on this {@link Executor}
|
||||
* @param callback the callback invoked with {@code true} if offload is supported
|
||||
*/
|
||||
public void queryOffloadScanSupport(@NonNull @CallbackExecutor Executor executor,
|
||||
@NonNull Consumer<Boolean> callback) {
|
||||
try {
|
||||
mService.queryOffloadScanSupport(new OffloadTransport(executor, callback));
|
||||
} catch (RemoteException e) {
|
||||
throw e.rethrowFromSystemServer();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Read from {@link Settings} whether Fast Pair scan is enabled.
|
||||
*
|
||||
|
|
@ -297,6 +315,29 @@ public class NearbyManager {
|
|||
"successfully %s Fast Pair scan", enable ? "enables" : "disables"));
|
||||
}
|
||||
|
||||
private static class OffloadTransport extends IOffloadCallback.Stub {
|
||||
|
||||
private final Executor mExecutor;
|
||||
// Null when cancelled
|
||||
volatile @Nullable Consumer<Boolean> mConsumer;
|
||||
|
||||
OffloadTransport(Executor executor, Consumer<Boolean> consumer) {
|
||||
Preconditions.checkArgument(executor != null, "illegal null executor");
|
||||
Preconditions.checkArgument(consumer != null, "illegal null consumer");
|
||||
mExecutor = executor;
|
||||
mConsumer = consumer;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onQueryComplete(boolean isOffloadSupported) {
|
||||
mExecutor.execute(() -> {
|
||||
if (mConsumer != null) {
|
||||
mConsumer.accept(isOffloadSupported);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
private static class ScanListenerTransport extends IScanListener.Stub {
|
||||
|
||||
private @ScanRequest.ScanType int mScanType;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,29 @@
|
|||
/*
|
||||
* Copyright (C) 2023, The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package android.nearby.aidl;
|
||||
|
||||
import android.nearby.NearbyDeviceParcelable;
|
||||
|
||||
/**
|
||||
* Listener for offload queries.
|
||||
*
|
||||
* {@hide}
|
||||
*/
|
||||
oneway interface IOffloadCallback {
|
||||
/** Invokes when ContextHub transaction completes. */
|
||||
void onQueryComplete(boolean isOffloadSupported);
|
||||
}
|
||||
|
|
@ -37,6 +37,7 @@ import android.nearby.INearbyManager;
|
|||
import android.nearby.IScanListener;
|
||||
import android.nearby.NearbyManager;
|
||||
import android.nearby.ScanRequest;
|
||||
import android.nearby.aidl.IOffloadCallback;
|
||||
import android.util.Log;
|
||||
|
||||
import com.android.internal.annotations.VisibleForTesting;
|
||||
|
|
@ -145,6 +146,11 @@ public class NearbyService extends INearbyManager.Stub {
|
|||
mBroadcastProviderManager.stopBroadcast(listener);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void queryOffloadScanSupport(IOffloadCallback callback) {
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Called by the service initializer.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -57,6 +57,7 @@ import java.util.concurrent.CountDownLatch;
|
|||
import java.util.concurrent.Executor;
|
||||
import java.util.concurrent.Executors;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import java.util.function.Consumer;
|
||||
|
||||
/**
|
||||
* TODO(b/215435939) This class doesn't include any logic yet. Because SELinux denies access to
|
||||
|
|
@ -99,6 +100,7 @@ public class NearbyManagerTest {
|
|||
public void onError(int errorCode) {
|
||||
}
|
||||
};
|
||||
|
||||
private static final Executor EXECUTOR = Executors.newSingleThreadExecutor();
|
||||
|
||||
@Before
|
||||
|
|
@ -171,6 +173,13 @@ public class NearbyManagerTest {
|
|||
assertThat(mNearbyManager.isFastPairScanEnabled(mContext)).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
@SdkSuppress(minSdkVersion = 34, codeName = "U")
|
||||
public void queryOffloadScanSupport() {
|
||||
OffloadCallback callback = new OffloadCallback();
|
||||
mNearbyManager.queryOffloadScanSupport(EXECUTOR, callback);
|
||||
}
|
||||
|
||||
private void enableBluetooth() {
|
||||
BluetoothManager manager = mContext.getSystemService(BluetoothManager.class);
|
||||
BluetoothAdapter bluetoothAdapter = manager.getAdapter();
|
||||
|
|
@ -178,4 +187,11 @@ public class NearbyManagerTest {
|
|||
assertThat(BTAdapterUtils.enableAdapter(bluetoothAdapter, mContext)).isTrue();
|
||||
}
|
||||
}
|
||||
|
||||
private class OffloadCallback implements Consumer<Boolean> {
|
||||
@Override
|
||||
public void accept(Boolean aBoolean) {
|
||||
// no-op for now
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue