Merge changes I088adcb6,I40289fb4 into tm-dev
* changes:
Refactor test scripts.
Refactor snippet RPC methods and events.
diff --git a/nearby/framework/java/android/nearby/BroadcastCallback.java b/nearby/framework/java/android/nearby/BroadcastCallback.java
index 54c1916..cc94308 100644
--- a/nearby/framework/java/android/nearby/BroadcastCallback.java
+++ b/nearby/framework/java/android/nearby/BroadcastCallback.java
@@ -60,5 +60,5 @@
/**
* Called when broadcast status changes.
*/
- void onStatus(@BroadcastStatus int status);
+ void onStatusChanged(@BroadcastStatus int status);
}
diff --git a/nearby/framework/java/android/nearby/aidl/FastPairAntispoofkeyDeviceMetadataRequestParcel.aidl b/nearby/framework/java/android/nearby/BroadcastRequest.aidl
similarity index 60%
copy from nearby/framework/java/android/nearby/aidl/FastPairAntispoofkeyDeviceMetadataRequestParcel.aidl
copy to nearby/framework/java/android/nearby/BroadcastRequest.aidl
index 175d73c..53f7d42 100644
--- a/nearby/framework/java/android/nearby/aidl/FastPairAntispoofkeyDeviceMetadataRequestParcel.aidl
+++ b/nearby/framework/java/android/nearby/BroadcastRequest.aidl
@@ -1,11 +1,11 @@
/*
- * Copyright (C) 2021 The Android Open Source Project
+ * Copyright (C) 2022, 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
+ * 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,
@@ -14,13 +14,6 @@
* limitations under the License.
*/
-package android.nearby.aidl;
+package android.nearby;
-/**
- * Request details for metadata of a Fast Pair device keyed by either
- * antispoofkey or modelId.
- * {@hide}
- */
-parcelable FastPairAntispoofkeyDeviceMetadataRequestParcel {
- byte[] modelId;
-}
\ No newline at end of file
+parcelable BroadcastRequest;
diff --git a/nearby/framework/java/android/nearby/BroadcastRequest.java b/nearby/framework/java/android/nearby/BroadcastRequest.java
index 27468dd..71d51d2 100644
--- a/nearby/framework/java/android/nearby/BroadcastRequest.java
+++ b/nearby/framework/java/android/nearby/BroadcastRequest.java
@@ -38,6 +38,9 @@
@SuppressLint("ParcelNotFinal") // BroadcastRequest constructor is not public
public abstract class BroadcastRequest implements Parcelable {
+ /** An unknown nearby broadcast request type. */
+ public static final int BROADCAST_TYPE_UNKNOWN = -1;
+
/** Broadcast type for advertising using nearby presence protocol. */
public static final int BROADCAST_TYPE_NEARBY_PRESENCE = 3;
@@ -45,31 +48,49 @@
// Currently, only Nearby Presence broadcast is supported, in the future
// broadcasting using other nearby specifications will be added.
@Retention(RetentionPolicy.SOURCE)
- @IntDef({BROADCAST_TYPE_NEARBY_PRESENCE})
+ @IntDef({BROADCAST_TYPE_UNKNOWN, BROADCAST_TYPE_NEARBY_PRESENCE})
public @interface BroadcastType {
}
/**
* Tx Power when the value is not set in the broadcast.
*/
- public static final int UNKNOWN_TX_POWER = -100;
+ public static final int UNKNOWN_TX_POWER = -127;
/**
- * V0 of Nearby Presence Protocol.
+ * An unknown version of presence broadcast request.
+ */
+ public static final int PRESENCE_VERSION_UNKNOWN = -1;
+
+ /**
+ * A legacy presence version that is only suitable for legacy (31 bytes) BLE advertisements.
+ * This exists to support legacy presence version, and not recommended for use.
*/
public static final int PRESENCE_VERSION_V0 = 0;
/**
- * V1 of Nearby Presence Protocol.
+ * V1 of Nearby Presence Protocol. This version supports both legacy (31 bytes) BLE
+ * advertisements, and extended BLE advertisements.
*/
public static final int PRESENCE_VERSION_V1 = 1;
/** @hide **/
@Retention(RetentionPolicy.SOURCE)
- @IntDef({PRESENCE_VERSION_V0, PRESENCE_VERSION_V1})
+ @IntDef({PRESENCE_VERSION_UNKNOWN, PRESENCE_VERSION_V0, PRESENCE_VERSION_V1})
public @interface BroadcastVersion {
}
+ /**
+ * The medium where the broadcast request should be sent.
+ *
+ * @hide
+ */
+ @IntDef({Medium.BLE, Medium.MDNS})
+ public @interface Medium {
+ int BLE = 1;
+ int MDNS = 2;
+ }
+
public static final @NonNull Creator<BroadcastRequest> CREATOR =
new Creator<BroadcastRequest>() {
@Override
@@ -93,10 +114,10 @@
private final @BroadcastType int mType;
private final @BroadcastVersion int mVersion;
private final int mTxPower;
- private final List<Integer> mMediums;
+ private final @Medium List<Integer> mMediums;
BroadcastRequest(@BroadcastType int type, @BroadcastVersion int version, int txPower,
- List<Integer> mediums) {
+ @Medium List<Integer> mediums) {
this.mType = type;
this.mVersion = version;
this.mTxPower = txPower;
@@ -137,6 +158,7 @@
* Returns the list of broadcast mediums.
*/
@NonNull
+ @Medium
public List<Integer> getMediums() {
return mMediums;
}
diff --git a/nearby/framework/java/android/nearby/FastPairAntispoofkeyDeviceMetadata.java b/nearby/framework/java/android/nearby/FastPairAntispoofKeyDeviceMetadata.java
similarity index 78%
rename from nearby/framework/java/android/nearby/FastPairAntispoofkeyDeviceMetadata.java
rename to nearby/framework/java/android/nearby/FastPairAntispoofKeyDeviceMetadata.java
index f756020..32fd043 100644
--- a/nearby/framework/java/android/nearby/FastPairAntispoofkeyDeviceMetadata.java
+++ b/nearby/framework/java/android/nearby/FastPairAntispoofKeyDeviceMetadata.java
@@ -19,33 +19,33 @@
import android.annotation.Nullable;
import android.annotation.SuppressLint;
import android.annotation.SystemApi;
-import android.nearby.aidl.FastPairAntispoofkeyDeviceMetadataParcel;
+import android.nearby.aidl.FastPairAntispoofKeyDeviceMetadataParcel;
/**
- * Class for a type of registered Fast Pair device keyed by modelID, or antiSpoofKey.
+ * Class for a type of registered Fast Pair device keyed by modelID, or antispoofKey.
* @hide
*/
@SystemApi
-public class FastPairAntispoofkeyDeviceMetadata {
+public class FastPairAntispoofKeyDeviceMetadata {
- FastPairAntispoofkeyDeviceMetadataParcel mMetadataParcel;
- FastPairAntispoofkeyDeviceMetadata(
- FastPairAntispoofkeyDeviceMetadataParcel metadataParcel) {
+ FastPairAntispoofKeyDeviceMetadataParcel mMetadataParcel;
+ FastPairAntispoofKeyDeviceMetadata(
+ FastPairAntispoofKeyDeviceMetadataParcel metadataParcel) {
this.mMetadataParcel = metadataParcel;
}
/**
- * Builder used to create FastPairAntisppofkeyDeviceMetadata.
+ * Builder used to create FastPairAntispoofKeyDeviceMetadata.
*/
public static final class Builder {
- private final FastPairAntispoofkeyDeviceMetadataParcel mBuilderParcel;
+ private final FastPairAntispoofKeyDeviceMetadataParcel mBuilderParcel;
/**
* Default constructor of Builder.
*/
public Builder() {
- mBuilderParcel = new FastPairAntispoofkeyDeviceMetadataParcel();
+ mBuilderParcel = new FastPairAntispoofKeyDeviceMetadataParcel();
mBuilderParcel.antiSpoofPublicKey = null;
mBuilderParcel.deviceMetadata = null;
}
@@ -78,11 +78,11 @@
}
/**
- * Build {@link FastPairAntispoofkeyDeviceMetadata} with the currently set configuration.
+ * Build {@link FastPairAntispoofKeyDeviceMetadata} with the currently set configuration.
*/
@NonNull
- public FastPairAntispoofkeyDeviceMetadata build() {
- return new FastPairAntispoofkeyDeviceMetadata(mBuilderParcel);
+ public FastPairAntispoofKeyDeviceMetadata build() {
+ return new FastPairAntispoofKeyDeviceMetadata(mBuilderParcel);
}
}
}
diff --git a/nearby/framework/java/android/nearby/FastPairDataProviderBase.java b/nearby/framework/java/android/nearby/FastPairDataProviderBase.java
index 57467b7..dfb8760 100644
--- a/nearby/framework/java/android/nearby/FastPairDataProviderBase.java
+++ b/nearby/framework/java/android/nearby/FastPairDataProviderBase.java
@@ -24,13 +24,13 @@
import android.nearby.aidl.ByteArrayParcel;
import android.nearby.aidl.FastPairAccountDevicesMetadataRequestParcel;
import android.nearby.aidl.FastPairAccountKeyDeviceMetadataParcel;
-import android.nearby.aidl.FastPairAntispoofkeyDeviceMetadataRequestParcel;
+import android.nearby.aidl.FastPairAntispoofKeyDeviceMetadataRequestParcel;
import android.nearby.aidl.FastPairEligibleAccountParcel;
import android.nearby.aidl.FastPairEligibleAccountsRequestParcel;
import android.nearby.aidl.FastPairManageAccountDeviceRequestParcel;
import android.nearby.aidl.FastPairManageAccountRequestParcel;
import android.nearby.aidl.IFastPairAccountDevicesMetadataCallback;
-import android.nearby.aidl.IFastPairAntispoofkeyDeviceMetadataCallback;
+import android.nearby.aidl.IFastPairAntispoofKeyDeviceMetadataCallback;
import android.nearby.aidl.IFastPairDataProvider;
import android.nearby.aidl.IFastPairEligibleAccountsCallback;
import android.nearby.aidl.IFastPairManageAccountCallback;
@@ -110,15 +110,15 @@
}
/**
- * Callback to be invoked when an antispoofkeyed device metadata is loaded.
+ * Callback to be invoked when an AntispoofKeyed device metadata is loaded.
*/
- public interface FastPairAntispoofkeyDeviceMetadataCallback {
+ public interface FastPairAntispoofKeyDeviceMetadataCallback {
/**
* Invoked once the meta data is loaded.
*/
- void onFastPairAntispoofkeyDeviceMetadataReceived(
- @NonNull FastPairAntispoofkeyDeviceMetadata metadata);
+ void onFastPairAntispoofKeyDeviceMetadataReceived(
+ @NonNull FastPairAntispoofKeyDeviceMetadata metadata);
/** Invoked in case of error. */
void onError(@ErrorCode int code, @Nullable String message);
}
@@ -166,9 +166,9 @@
* Fulfills the Fast Pair device metadata request by using callback to send back the
* device meta data of a given modelId.
*/
- public abstract void onLoadFastPairAntispoofkeyDeviceMetadata(
- @NonNull FastPairAntispoofkeyDeviceMetadataRequest request,
- @NonNull FastPairAntispoofkeyDeviceMetadataCallback callback);
+ public abstract void onLoadFastPairAntispoofKeyDeviceMetadata(
+ @NonNull FastPairAntispoofKeyDeviceMetadataRequest request,
+ @NonNull FastPairAntispoofKeyDeviceMetadataCallback callback);
/**
* Fulfills the account tied Fast Pair devices metadata request by using callback to send back
@@ -208,18 +208,18 @@
}
/**
- * Class for reading FastPairAntispoofkeyDeviceMetadataRequest.
+ * Class for reading FastPairAntispoofKeyDeviceMetadataRequest.
*/
- public static class FastPairAntispoofkeyDeviceMetadataRequest {
+ public static class FastPairAntispoofKeyDeviceMetadataRequest {
- private final FastPairAntispoofkeyDeviceMetadataRequestParcel mMetadataRequestParcel;
+ private final FastPairAntispoofKeyDeviceMetadataRequestParcel mMetadataRequestParcel;
- private FastPairAntispoofkeyDeviceMetadataRequest(
- final FastPairAntispoofkeyDeviceMetadataRequestParcel metaDataRequestParcel) {
+ private FastPairAntispoofKeyDeviceMetadataRequest(
+ final FastPairAntispoofKeyDeviceMetadataRequestParcel metaDataRequestParcel) {
this.mMetadataRequestParcel = metaDataRequestParcel;
}
- /** Get modelId, the key for FastPairAntispoofkeyDeviceMetadata. */
+ /** Get modelId, the key for FastPairAntispoofKeyDeviceMetadata. */
public @NonNull byte[] getModelId() {
return this.mMetadataRequestParcel.modelId;
}
@@ -338,26 +338,26 @@
}
/**
- * Callback class that sends back FastPairAntispoofkeyDeviceMetadata.
+ * Callback class that sends back FastPairAntispoofKeyDeviceMetadata.
*/
- private final class WrapperFastPairAntispoofkeyDeviceMetadataCallback implements
- FastPairAntispoofkeyDeviceMetadataCallback {
+ private final class WrapperFastPairAntispoofKeyDeviceMetadataCallback implements
+ FastPairAntispoofKeyDeviceMetadataCallback {
- private IFastPairAntispoofkeyDeviceMetadataCallback mCallback;
+ private IFastPairAntispoofKeyDeviceMetadataCallback mCallback;
- private WrapperFastPairAntispoofkeyDeviceMetadataCallback(
- IFastPairAntispoofkeyDeviceMetadataCallback callback) {
+ private WrapperFastPairAntispoofKeyDeviceMetadataCallback(
+ IFastPairAntispoofKeyDeviceMetadataCallback callback) {
mCallback = callback;
}
/**
- * Sends back FastPairAntispoofkeyDeviceMetadata.
+ * Sends back FastPairAntispoofKeyDeviceMetadata.
*/
@Override
- public void onFastPairAntispoofkeyDeviceMetadataReceived(
- @NonNull FastPairAntispoofkeyDeviceMetadata metadata) {
+ public void onFastPairAntispoofKeyDeviceMetadataReceived(
+ @NonNull FastPairAntispoofKeyDeviceMetadata metadata) {
try {
- mCallback.onFastPairAntispoofkeyDeviceMetadataReceived(metadata.mMetadataParcel);
+ mCallback.onFastPairAntispoofKeyDeviceMetadataReceived(metadata.mMetadataParcel);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
} catch (RuntimeException e) {
@@ -555,12 +555,12 @@
}
@Override
- public void loadFastPairAntispoofkeyDeviceMetadata(
- @NonNull FastPairAntispoofkeyDeviceMetadataRequestParcel requestParcel,
- IFastPairAntispoofkeyDeviceMetadataCallback callback) {
- onLoadFastPairAntispoofkeyDeviceMetadata(
- new FastPairAntispoofkeyDeviceMetadataRequest(requestParcel),
- new WrapperFastPairAntispoofkeyDeviceMetadataCallback(callback));
+ public void loadFastPairAntispoofKeyDeviceMetadata(
+ @NonNull FastPairAntispoofKeyDeviceMetadataRequestParcel requestParcel,
+ IFastPairAntispoofKeyDeviceMetadataCallback callback) {
+ onLoadFastPairAntispoofKeyDeviceMetadata(
+ new FastPairAntispoofKeyDeviceMetadataRequest(requestParcel),
+ new WrapperFastPairAntispoofKeyDeviceMetadataCallback(callback));
}
@Override
diff --git a/nearby/framework/java/android/nearby/aidl/FastPairAntispoofkeyDeviceMetadataRequestParcel.aidl b/nearby/framework/java/android/nearby/IBroadcastListener.aidl
similarity index 62%
copy from nearby/framework/java/android/nearby/aidl/FastPairAntispoofkeyDeviceMetadataRequestParcel.aidl
copy to nearby/framework/java/android/nearby/IBroadcastListener.aidl
index 175d73c..98c7e17 100644
--- a/nearby/framework/java/android/nearby/aidl/FastPairAntispoofkeyDeviceMetadataRequestParcel.aidl
+++ b/nearby/framework/java/android/nearby/IBroadcastListener.aidl
@@ -1,11 +1,11 @@
/*
- * Copyright (C) 2021 The Android Open Source Project
+ * Copyright (C) 2022, 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
+ * 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,
@@ -14,13 +14,14 @@
* limitations under the License.
*/
-package android.nearby.aidl;
+package android.nearby;
/**
- * Request details for metadata of a Fast Pair device keyed by either
- * antispoofkey or modelId.
+ * Callback when brodacast status changes.
+ *
* {@hide}
*/
-parcelable FastPairAntispoofkeyDeviceMetadataRequestParcel {
- byte[] modelId;
-}
\ No newline at end of file
+oneway interface IBroadcastListener {
+ /** Called when the broadcast status changes. */
+ void onStatusChanged(int status);
+}
diff --git a/nearby/framework/java/android/nearby/INearbyManager.aidl b/nearby/framework/java/android/nearby/INearbyManager.aidl
index 4fff563..91dd485 100644
--- a/nearby/framework/java/android/nearby/INearbyManager.aidl
+++ b/nearby/framework/java/android/nearby/INearbyManager.aidl
@@ -16,7 +16,9 @@
package android.nearby;
+import android.nearby.IBroadcastListener;
import android.nearby.IScanListener;
+import android.nearby.BroadcastRequest;
import android.nearby.ScanRequest;
/**
@@ -29,4 +31,8 @@
void registerScanListener(in ScanRequest scanRequest, in IScanListener listener);
void unregisterScanListener(in IScanListener listener);
+
+ void startBroadcast(in BroadcastRequest broadcastRequest, in IBroadcastListener callback);
+
+ void stopBroadcast(in IBroadcastListener callback);
}
\ No newline at end of file
diff --git a/nearby/framework/java/android/nearby/NearbyManager.java b/nearby/framework/java/android/nearby/NearbyManager.java
index a217677..1d91242 100644
--- a/nearby/framework/java/android/nearby/NearbyManager.java
+++ b/nearby/framework/java/android/nearby/NearbyManager.java
@@ -59,6 +59,10 @@
@GuardedBy("sScanListeners")
private static final WeakHashMap<ScanCallback, WeakReference<ScanListenerTransport>>
sScanListeners = new WeakHashMap<>();
+ @GuardedBy("sBroadcastListeners")
+ private static final WeakHashMap<BroadcastCallback, WeakReference<BroadcastListenerTransport>>
+ sBroadcastListeners = new WeakHashMap<>();
+
private final INearbyManager mService;
/**
@@ -157,7 +161,23 @@
*/
public void startBroadcast(@NonNull BroadcastRequest broadcastRequest,
@CallbackExecutor @NonNull Executor executor, @NonNull BroadcastCallback callback) {
- // TODO(b/218187205): implement broadcast.
+ try {
+ synchronized (sBroadcastListeners) {
+ WeakReference<BroadcastListenerTransport> reference = sBroadcastListeners.get(
+ callback);
+ BroadcastListenerTransport transport = reference != null ? reference.get() : null;
+ if (transport == null) {
+ transport = new BroadcastListenerTransport(callback, executor);
+ } else {
+ Preconditions.checkState(transport.isRegistered());
+ transport.setExecutor(executor);
+ }
+ mService.startBroadcast(broadcastRequest, transport);
+ sBroadcastListeners.put(callback, new WeakReference<>(transport));
+ }
+ } catch (RemoteException e) {
+ throw e.rethrowFromSystemServer();
+ }
}
/**
@@ -167,7 +187,19 @@
*/
@SuppressLint("ExecutorRegistration")
public void stopBroadcast(@NonNull BroadcastCallback callback) {
- // TODO(b/218187205): implement broadcast.
+ try {
+ synchronized (sBroadcastListeners) {
+ WeakReference<BroadcastListenerTransport> reference = sBroadcastListeners.remove(
+ callback);
+ BroadcastListenerTransport transport = reference != null ? reference.get() : null;
+ if (transport != null) {
+ transport.unregister();
+ mService.stopBroadcast(transport);
+ }
+ }
+ } catch (RemoteException e) {
+ throw e.rethrowFromSystemServer();
+ }
}
/**
@@ -248,4 +280,34 @@
toClientNearbyDevice(nearbyDeviceParcelable, mScanType)));
}
}
+
+ private static class BroadcastListenerTransport extends IBroadcastListener.Stub {
+ private volatile @Nullable BroadcastCallback mBroadcastCallback;
+ private Executor mExecutor;
+
+ BroadcastListenerTransport(BroadcastCallback broadcastCallback,
+ @CallbackExecutor Executor executor) {
+ mBroadcastCallback = broadcastCallback;
+ mExecutor = executor;
+ }
+
+ void setExecutor(Executor executor) {
+ Preconditions.checkArgument(
+ executor != null, "invalid null executor");
+ mExecutor = executor;
+ }
+
+ boolean isRegistered() {
+ return mBroadcastCallback != null;
+ }
+
+ void unregister() {
+ mBroadcastCallback = null;
+ }
+
+ @Override
+ public void onStatusChanged(int status) {
+ mExecutor.execute(()-> mBroadcastCallback.onStatusChanged(status));
+ }
+ }
}
diff --git a/nearby/framework/java/android/nearby/PresenceBroadcastRequest.java b/nearby/framework/java/android/nearby/PresenceBroadcastRequest.java
index b4d4b55..d01be06 100644
--- a/nearby/framework/java/android/nearby/PresenceBroadcastRequest.java
+++ b/nearby/framework/java/android/nearby/PresenceBroadcastRequest.java
@@ -137,18 +137,20 @@
private final List<Integer> mMediums;
private final List<Integer> mActions;
private final List<DataElement> mExtendedProperties;
+ private final byte[] mSalt;
+ private final PrivateCredential mCredential;
private int mVersion;
private int mTxPower;
- private byte[] mSalt;
- private PrivateCredential mCredential;
- public Builder(@NonNull List<Integer> mediums, @NonNull byte[] salt) {
+ public Builder(@NonNull List<Integer> mediums, @NonNull byte[] salt,
+ @NonNull PrivateCredential credential) {
Preconditions.checkState(!mediums.isEmpty(), "mediums cannot be empty");
Preconditions.checkState(salt != null && salt.length > 0, "salt cannot be empty");
mVersion = PRESENCE_VERSION_V0;
mTxPower = UNKNOWN_TX_POWER;
+ mCredential = credential;
mActions = new ArrayList<>();
mExtendedProperties = new ArrayList<>();
@@ -185,16 +187,6 @@
}
/**
- * Sets the credential associated with the presence broadcast request.
- */
- @NonNull
- public Builder setCredential(@NonNull PrivateCredential credential) {
- Objects.requireNonNull(credential);
- mCredential = credential;
- return this;
- }
-
- /**
* Adds an extended property for the presence broadcast request.
*/
@NonNull
diff --git a/nearby/framework/java/android/nearby/PresenceDevice.java b/nearby/framework/java/android/nearby/PresenceDevice.java
index d5ea0b4..12fc2a3 100644
--- a/nearby/framework/java/android/nearby/PresenceDevice.java
+++ b/nearby/framework/java/android/nearby/PresenceDevice.java
@@ -162,6 +162,12 @@
dest.writeInt(medium);
}
dest.writeInt(getRssi());
+ dest.writeInt(mSalt.length);
+ dest.writeByteArray(mSalt);
+ dest.writeInt(mSecretId.length);
+ dest.writeByteArray(mSecretId);
+ dest.writeInt(mEncryptedIdentity.length);
+ dest.writeByteArray(mEncryptedIdentity);
dest.writeString(mDeviceId);
dest.writeInt(mDeviceType);
dest.writeInt(mDeviceImageUrl == null ? 0 : 1);
@@ -184,26 +190,47 @@
public static final Creator<PresenceDevice> CREATOR = new Creator<PresenceDevice>() {
@Override
public PresenceDevice createFromParcel(Parcel in) {
- Builder builder = new Builder();
+ String name = null;
if (in.readInt() == 1) {
- builder.setName(in.readString());
+ name = in.readString();
}
int size = in.readInt();
+ List<Integer> mediums = new ArrayList<>();
for (int i = 0; i < size; i++) {
- builder.addMedium(in.readInt());
+ mediums.add(in.readInt());
}
- builder.setRssi(in.readInt());
- builder.setDeviceId(in.readString());
- builder.setDeviceType(in.readInt());
+ int rssi = in.readInt();
+ byte[] salt = new byte[in.readInt()];
+ in.readByteArray(salt);
+ byte[] secretId = new byte[in.readInt()];
+ in.readByteArray(secretId);
+ byte[] encryptedIdentity = new byte[in.readInt()];
+ in.readByteArray(encryptedIdentity);
+ String deviceId = in.readString();
+ int deviceType = in.readInt();
+ String deviceImageUrl = null;
if (in.readInt() == 1) {
- builder.setDeviceImageUrl(in.readString());
+ deviceImageUrl = in.readString();
}
- builder.setDiscoveryTimestampMillis(in.readLong());
+ long discoveryTimeMillis = in.readLong();
int dataElementSize = in.readInt();
+ List<DataElement> dataElements = new ArrayList<>();
for (int i = 0; i < dataElementSize; i++) {
- builder.addExtendedProperty(
+ dataElements.add(
in.readParcelable(DataElement.class.getClassLoader(), DataElement.class));
}
+ Builder builder = new Builder(deviceId, salt, secretId, encryptedIdentity)
+ .setName(name)
+ .setRssi(rssi)
+ .setDeviceType(deviceType)
+ .setDeviceImageUrl(deviceImageUrl)
+ .setDiscoveryTimestampMillis(discoveryTimeMillis);
+ for (int i = 0; i < mediums.size(); i++) {
+ builder.addMedium(mediums.get(i));
+ }
+ for (int i = 0; i < dataElements.size(); i++) {
+ builder.addExtendedProperty(dataElements.get(i));
+ }
return builder.build();
}
@@ -220,21 +247,34 @@
private final List<DataElement> mExtendedProperties;
private final List<Integer> mMediums;
+ private final String mDeviceId;
+ private final byte[] mSalt;
+ private final byte[] mSecretId;
+ private final byte[] mEncryptedIdentity;
private String mName;
private int mRssi;
- private String mDeviceId;
- private byte[] mSalt;
- private byte[] mSecretId;
- private byte[] mEncryptedIdentity;
private int mDeviceType;
private String mDeviceImageUrl;
private long mDiscoveryTimestampMillis;
- public Builder() {
+ /**
+ * Constructs a {@link Builder}.
+ *
+ * @param deviceId the identifier on the discovered Presence device
+ * @param salt a random salt used in the beacon from the Presence device.
+ * @param secretId a secret identifier used in the beacon from the Presence device.
+ * @param encryptedIdentity the identity associated with the Presence device.
+ */
+ public Builder(@NonNull String deviceId, @NonNull byte[] salt, @NonNull byte[] secretId,
+ @NonNull byte[] encryptedIdentity) {
+ mDeviceId = deviceId;
+ mSalt = salt;
+ mSecretId = secretId;
+ mEncryptedIdentity = encryptedIdentity;
mMediums = new ArrayList<>();
mExtendedProperties = new ArrayList<>();
- mRssi = -100;
+ mRssi = -127;
}
/**
@@ -271,48 +311,6 @@
}
/**
- * Sets the identifier on the discovered Presence device.
- *
- * @param deviceId Identifier of the Presence device.
- */
- @NonNull
- public Builder setDeviceId(@NonNull String deviceId) {
- Objects.requireNonNull(deviceId);
- mDeviceId = deviceId;
- return this;
- }
-
- /**
- * Sets the identifier on the discovered Presence device.
- */
- @NonNull
- public Builder setSalt(@NonNull byte[] salt) {
- Objects.requireNonNull(salt);
- mSalt = salt;
- return this;
- }
-
- /**
- * Sets the secret id of the discovered Presence device.
- */
- @NonNull
- public Builder setSecretId(@NonNull byte[] secretId) {
- Objects.requireNonNull(secretId);
- mSecretId = secretId;
- return this;
- }
-
- /**
- * Sets the encrypted identity of the discovered Presence device.
- */
- @NonNull
- public Builder setEncryptedIdentity(@NonNull byte[] encryptedIdentity) {
- Objects.requireNonNull(encryptedIdentity);
- mEncryptedIdentity = encryptedIdentity;
- return this;
- }
-
- /**
* Sets the type of discovered Presence device.
*
* @param deviceType Type of the Presence device.
diff --git a/nearby/framework/java/android/nearby/aidl/FastPairAntispoofkeyDeviceMetadataParcel.aidl b/nearby/framework/java/android/nearby/aidl/FastPairAntispoofKeyDeviceMetadataParcel.aidl
similarity index 89%
rename from nearby/framework/java/android/nearby/aidl/FastPairAntispoofkeyDeviceMetadataParcel.aidl
rename to nearby/framework/java/android/nearby/aidl/FastPairAntispoofKeyDeviceMetadataParcel.aidl
index 8ca66d2..071d020 100644
--- a/nearby/framework/java/android/nearby/aidl/FastPairAntispoofkeyDeviceMetadataParcel.aidl
+++ b/nearby/framework/java/android/nearby/aidl/FastPairAntispoofKeyDeviceMetadataParcel.aidl
@@ -17,12 +17,12 @@
import android.nearby.aidl.FastPairDeviceMetadataParcel;
/**
- * Metadata of a Fast Pair device keyed by Antispoofkey,
+ * Metadata of a Fast Pair device keyed by AntispoofKey,
* Used by initial pairing without account association.
*
* {@hide}
*/
-parcelable FastPairAntispoofkeyDeviceMetadataParcel {
+parcelable FastPairAntispoofKeyDeviceMetadataParcel {
// Anti spoof public key.
byte[] antiSpoofPublicKey;
diff --git a/nearby/framework/java/android/nearby/aidl/FastPairAntispoofkeyDeviceMetadataRequestParcel.aidl b/nearby/framework/java/android/nearby/aidl/FastPairAntispoofKeyDeviceMetadataRequestParcel.aidl
similarity index 89%
rename from nearby/framework/java/android/nearby/aidl/FastPairAntispoofkeyDeviceMetadataRequestParcel.aidl
rename to nearby/framework/java/android/nearby/aidl/FastPairAntispoofKeyDeviceMetadataRequestParcel.aidl
index 175d73c..afdcf15 100644
--- a/nearby/framework/java/android/nearby/aidl/FastPairAntispoofkeyDeviceMetadataRequestParcel.aidl
+++ b/nearby/framework/java/android/nearby/aidl/FastPairAntispoofKeyDeviceMetadataRequestParcel.aidl
@@ -18,9 +18,9 @@
/**
* Request details for metadata of a Fast Pair device keyed by either
- * antispoofkey or modelId.
+ * antispoofKey or modelId.
* {@hide}
*/
-parcelable FastPairAntispoofkeyDeviceMetadataRequestParcel {
+parcelable FastPairAntispoofKeyDeviceMetadataRequestParcel {
byte[] modelId;
}
\ No newline at end of file
diff --git a/nearby/framework/java/android/nearby/aidl/IFastPairAntispoofkeyDeviceMetadataCallback.aidl b/nearby/framework/java/android/nearby/aidl/IFastPairAntispoofKeyDeviceMetadataCallback.aidl
similarity index 75%
rename from nearby/framework/java/android/nearby/aidl/IFastPairAntispoofkeyDeviceMetadataCallback.aidl
rename to nearby/framework/java/android/nearby/aidl/IFastPairAntispoofKeyDeviceMetadataCallback.aidl
index 87c9796..38abba4 100644
--- a/nearby/framework/java/android/nearby/aidl/IFastPairAntispoofkeyDeviceMetadataCallback.aidl
+++ b/nearby/framework/java/android/nearby/aidl/IFastPairAntispoofKeyDeviceMetadataCallback.aidl
@@ -14,14 +14,14 @@
package android.nearby.aidl;
-import android.nearby.aidl.FastPairAntispoofkeyDeviceMetadataParcel;
+import android.nearby.aidl.FastPairAntispoofKeyDeviceMetadataParcel;
/**
- * Provides callback interface for OEMs to send FastPair Antispoofkey Device metadata back.
+ * Provides callback interface for OEMs to send FastPair AntispoofKey Device metadata back.
*
* {@hide}
*/
-interface IFastPairAntispoofkeyDeviceMetadataCallback {
- void onFastPairAntispoofkeyDeviceMetadataReceived(in FastPairAntispoofkeyDeviceMetadataParcel metadata);
+interface IFastPairAntispoofKeyDeviceMetadataCallback {
+ void onFastPairAntispoofKeyDeviceMetadataReceived(in FastPairAntispoofKeyDeviceMetadataParcel metadata);
void onError(int code, String message);
}
\ No newline at end of file
diff --git a/nearby/framework/java/android/nearby/aidl/IFastPairDataProvider.aidl b/nearby/framework/java/android/nearby/aidl/IFastPairDataProvider.aidl
index 73aef9e..2956211 100644
--- a/nearby/framework/java/android/nearby/aidl/IFastPairDataProvider.aidl
+++ b/nearby/framework/java/android/nearby/aidl/IFastPairDataProvider.aidl
@@ -14,8 +14,8 @@
package android.nearby.aidl;
-import android.nearby.aidl.FastPairAntispoofkeyDeviceMetadataRequestParcel;
-import android.nearby.aidl.IFastPairAntispoofkeyDeviceMetadataCallback;
+import android.nearby.aidl.FastPairAntispoofKeyDeviceMetadataRequestParcel;
+import android.nearby.aidl.IFastPairAntispoofKeyDeviceMetadataCallback;
import android.nearby.aidl.FastPairAccountDevicesMetadataRequestParcel;
import android.nearby.aidl.IFastPairAccountDevicesMetadataCallback;
import android.nearby.aidl.FastPairEligibleAccountsRequestParcel;
@@ -31,8 +31,8 @@
* {@hide}
*/
oneway interface IFastPairDataProvider {
- void loadFastPairAntispoofkeyDeviceMetadata(in FastPairAntispoofkeyDeviceMetadataRequestParcel request,
- in IFastPairAntispoofkeyDeviceMetadataCallback callback);
+ void loadFastPairAntispoofKeyDeviceMetadata(in FastPairAntispoofKeyDeviceMetadataRequestParcel request,
+ in IFastPairAntispoofKeyDeviceMetadataCallback callback);
void loadFastPairAccountDevicesMetadata(in FastPairAccountDevicesMetadataRequestParcel request,
in IFastPairAccountDevicesMetadataCallback callback);
void loadFastPairEligibleAccounts(in FastPairEligibleAccountsRequestParcel request,
diff --git a/nearby/service/java/com/android/server/nearby/NearbyConfiguration.java b/nearby/service/java/com/android/server/nearby/NearbyConfiguration.java
new file mode 100644
index 0000000..8fdac87
--- /dev/null
+++ b/nearby/service/java/com/android/server/nearby/NearbyConfiguration.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2022 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 com.android.server.nearby;
+
+import android.provider.DeviceConfig;
+
+import androidx.annotation.VisibleForTesting;
+
+/**
+ * A utility class for encapsulating Nearby feature flag configurations.
+ */
+public class NearbyConfiguration {
+
+ /**
+ * Flag use to enable presence legacy broadcast.
+ */
+ public static final String NEARBY_ENABLE_PRESENCE_BROADCAST_LEGACY =
+ "nearby_enable_presence_broadcast_legacy";
+
+ private boolean mEnablePresenceBroadcastLegacy;
+
+ public NearbyConfiguration() {
+ mEnablePresenceBroadcastLegacy = getDeviceConfigBoolean(
+ NEARBY_ENABLE_PRESENCE_BROADCAST_LEGACY, false /* defaultValue */);
+
+ }
+
+ /**
+ * Returns whether broadcasting legacy presence spec is enabled.
+ */
+ public boolean isPresenceBroadcastLegacyEnabled() {
+ return mEnablePresenceBroadcastLegacy;
+ }
+
+ private boolean getDeviceConfigBoolean(final String name, final boolean defaultValue) {
+ final String value = getDeviceConfigProperty(name);
+ return value != null ? Boolean.parseBoolean(value) : defaultValue;
+ }
+
+ @VisibleForTesting
+ protected String getDeviceConfigProperty(String name) {
+ return DeviceConfig.getProperty(DeviceConfig.NAMESPACE_TETHERING, name);
+ }
+}
diff --git a/nearby/service/java/com/android/server/nearby/NearbyService.java b/nearby/service/java/com/android/server/nearby/NearbyService.java
index 6d149fc..74b327a 100644
--- a/nearby/service/java/com/android/server/nearby/NearbyService.java
+++ b/nearby/service/java/com/android/server/nearby/NearbyService.java
@@ -27,6 +27,8 @@
import android.content.Intent;
import android.content.IntentFilter;
import android.hardware.location.ContextHubManager;
+import android.nearby.BroadcastRequest;
+import android.nearby.IBroadcastListener;
import android.nearby.INearbyManager;
import android.nearby.IScanListener;
import android.nearby.ScanRequest;
@@ -38,6 +40,7 @@
import com.android.server.nearby.injector.Injector;
import com.android.server.nearby.presence.ChreCommunication;
import com.android.server.nearby.presence.PresenceManager;
+import com.android.server.nearby.provider.BroadcastProviderManager;
import com.android.server.nearby.provider.DiscoveryProviderManager;
import com.android.server.nearby.provider.FastPairDataProvider;
@@ -71,11 +74,13 @@
}
};
private DiscoveryProviderManager mProviderManager;
+ private BroadcastProviderManager mBroadcastProviderManager;
public NearbyService(Context context) {
mContext = context;
mSystemInjector = new SystemInjector(context);
mProviderManager = new DiscoveryProviderManager(context, mSystemInjector);
+ mBroadcastProviderManager = new BroadcastProviderManager(context, mSystemInjector);
final LocatorContextWrapper lcw = new LocatorContextWrapper(context, null);
mFastPairManager = new FastPairManager(lcw);
mPresenceManager =
@@ -103,6 +108,16 @@
mProviderManager.unregisterScanListener(listener);
}
+ @Override
+ public void startBroadcast(BroadcastRequest broadcastRequest, IBroadcastListener listener) {
+ mBroadcastProviderManager.startBroadcast(broadcastRequest, listener);
+ }
+
+ @Override
+ public void stopBroadcast(IBroadcastListener listener) {
+ mBroadcastProviderManager.stopBroadcast(listener);
+ }
+
/**
* Called by the service initializer.
*
diff --git a/nearby/service/java/com/android/server/nearby/fastpair/FastPairAdvHandler.java b/nearby/service/java/com/android/server/nearby/fastpair/FastPairAdvHandler.java
index 4ee16b7..ac84199 100644
--- a/nearby/service/java/com/android/server/nearby/fastpair/FastPairAdvHandler.java
+++ b/nearby/service/java/com/android/server/nearby/fastpair/FastPairAdvHandler.java
@@ -83,7 +83,7 @@
// Use api to get anti spoofing key from model id.
try {
Rpcs.GetObservedDeviceResponse response =
- dataProvider.loadFastPairAntispoofkeyDeviceMetadata(model);
+ dataProvider.loadFastPairAntispoofKeyDeviceMetadata(model);
if (response == null) {
Log.e(TAG, "server does not have model id "
+ Hex.bytesToStringLowercase(model));
diff --git a/nearby/service/java/com/android/server/nearby/presence/FastAdvertisement.java b/nearby/service/java/com/android/server/nearby/presence/FastAdvertisement.java
new file mode 100644
index 0000000..e4df673
--- /dev/null
+++ b/nearby/service/java/com/android/server/nearby/presence/FastAdvertisement.java
@@ -0,0 +1,203 @@
+/*
+ * Copyright (C) 2022 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 com.android.server.nearby.presence;
+
+import android.annotation.Nullable;
+import android.nearby.BroadcastRequest;
+import android.nearby.PresenceBroadcastRequest;
+import android.nearby.PresenceCredential;
+
+import com.android.internal.util.Preconditions;
+
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * A Nearby Presence advertisement to be advertised on BT4.2 devices.
+ *
+ * <p>Serializable between Java object and bytes formats. Java object is used at the upper scanning
+ * and advertising interface as an abstraction of the actual bytes. Bytes format is used at the
+ * underlying BLE and mDNS stacks, which do necessary slicing and merging based on advertising
+ * capacities.
+ */
+// The fast advertisement is defined in the format below:
+// Header (1 byte) | salt (2 bytes) | identity (14 bytes) | tx_power (1 byte) | actions (1~ bytes)
+// The header contains:
+// version (3 bits) | provision_mode_flag (1 bit) | identity_type (3 bits) |
+// extended_advertisement_mode (1 bit)
+public class FastAdvertisement {
+
+ private static final int FAST_ADVERTISEMENT_MAX_LENGTH = 24;
+
+ static final byte INVALID_TX_POWER = (byte) 0xFF;
+
+ static final int HEADER_LENGTH = 1;
+
+ static final int SALT_LENGTH = 2;
+
+ static final int IDENTITY_LENGTH = 14;
+
+ static final int TX_POWER_LENGTH = 1;
+
+ private static final int MAX_ACTION_COUNT = 6;
+
+ /**
+ * Creates a {@link FastAdvertisement} from a Presence Broadcast Request.
+ */
+ public static FastAdvertisement createFromRequest(PresenceBroadcastRequest request) {
+ byte[] salt = request.getSalt();
+ byte[] identity = request.getCredential().getMetadataEncryptionKey();
+ List<Integer> actions = request.getActions();
+ Preconditions.checkArgument(
+ salt.length == SALT_LENGTH,
+ "FastAdvertisement's salt does not match correct length");
+ Preconditions.checkArgument(
+ identity.length == IDENTITY_LENGTH,
+ "FastAdvertisement's identity does not match correct length");
+ Preconditions.checkArgument(
+ !actions.isEmpty(), "FastAdvertisement must contain at least one action");
+ Preconditions.checkArgument(
+ actions.size() <= MAX_ACTION_COUNT,
+ "FastAdvertisement advertised actions cannot exceed max count " + MAX_ACTION_COUNT);
+
+ return new FastAdvertisement(
+ request.getCredential().getIdentityType(),
+ identity,
+ salt,
+ actions,
+ (byte) request.getTxPower());
+ }
+
+ /** Serialize an {@link FastAdvertisement} object into bytes. */
+ public byte[] toBytes() {
+ ByteBuffer buffer = ByteBuffer.allocate(getLength());
+
+ buffer.put(FastAdvertisementUtils.constructHeader(getVersion(), mIdentityType));
+ buffer.put(mSalt);
+ buffer.put(getIdentity());
+
+ buffer.put(mTxPower == null ? INVALID_TX_POWER : mTxPower);
+ for (int action : mActions) {
+ buffer.put((byte) action);
+ }
+ return buffer.array();
+ }
+
+ private final int mLength;
+
+ private final int mLtvFieldCount;
+
+ @PresenceCredential.IdentityType private final int mIdentityType;
+
+ private final byte[] mIdentity;
+
+ private final byte[] mSalt;
+
+ private final List<Integer> mActions;
+
+ @Nullable
+ private final Byte mTxPower;
+
+ FastAdvertisement(
+ @PresenceCredential.IdentityType int identityType,
+ byte[] identity,
+ byte[] salt,
+ List<Integer> actions,
+ @Nullable Byte txPower) {
+ this.mIdentityType = identityType;
+ this.mIdentity = identity;
+ this.mSalt = salt;
+ this.mActions = actions;
+ this.mTxPower = txPower;
+ int ltvFieldCount = 3;
+ int length =
+ HEADER_LENGTH // header
+ + identity.length
+ + salt.length
+ + actions.size();
+ length += TX_POWER_LENGTH;
+ if (txPower != null) { // TX power
+ ltvFieldCount += 1;
+ }
+ this.mLength = length;
+ this.mLtvFieldCount = ltvFieldCount;
+ Preconditions.checkArgument(
+ length <= FAST_ADVERTISEMENT_MAX_LENGTH,
+ "FastAdvertisement exceeds maximum length");
+ }
+
+ /** Returns the version in the advertisement. */
+ @BroadcastRequest.BroadcastVersion
+ public int getVersion() {
+ return BroadcastRequest.PRESENCE_VERSION_V0;
+ }
+
+ /** Returns the identity type in the advertisement. */
+ @PresenceCredential.IdentityType
+ public int getIdentityType() {
+ return mIdentityType;
+ }
+
+ /** Returns the identity bytes in the advertisement. */
+ public byte[] getIdentity() {
+ return mIdentity.clone();
+ }
+
+ /** Returns the salt of the advertisement. */
+ public byte[] getSalt() {
+ return mSalt.clone();
+ }
+
+ /** Returns the actions in the advertisement. */
+ public List<Integer> getActions() {
+ return new ArrayList<>(mActions);
+ }
+
+ /** Returns the adjusted TX Power in the advertisement. Null if not available. */
+ @Nullable
+ public Byte getTxPower() {
+ return mTxPower;
+ }
+
+ /** Returns the length of the advertisement. */
+ public int getLength() {
+ return mLength;
+ }
+
+ /** Returns the count of LTV fields in the advertisement. */
+ public int getLtvFieldCount() {
+ return mLtvFieldCount;
+ }
+
+ @Override
+ public String toString() {
+ return String.format(
+ "FastAdvertisement:<VERSION: %s, length: %s, ltvFieldCount: %s, identityType: %s,"
+ + " identity: %s, salt: %s, actions: %s, txPower: %s",
+ getVersion(),
+ getLength(),
+ getLtvFieldCount(),
+ getIdentityType(),
+ Arrays.toString(getIdentity()),
+ Arrays.toString(getSalt()),
+ getActions(),
+ getTxPower());
+ }
+}
diff --git a/nearby/service/java/com/android/server/nearby/presence/FastAdvertisementUtils.java b/nearby/service/java/com/android/server/nearby/presence/FastAdvertisementUtils.java
new file mode 100644
index 0000000..ab0a246
--- /dev/null
+++ b/nearby/service/java/com/android/server/nearby/presence/FastAdvertisementUtils.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2022 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 com.android.server.nearby.presence;
+
+import android.nearby.BroadcastRequest;
+
+/**
+ * Provides serialization and deserialization util methods for {@link FastAdvertisement}.
+ */
+public final class FastAdvertisementUtils {
+
+ private static final int VERSION_MASK = 0b11100000;
+
+ private static final int IDENTITY_TYPE_MASK = 0b00001110;
+
+ /**
+ * Constructs the header of a {@link FastAdvertisement}.
+ */
+ public static byte constructHeader(@BroadcastRequest.BroadcastVersion int version,
+ int identityType) {
+ return (byte) (((version << 5) & VERSION_MASK) | ((identityType << 1)
+ & IDENTITY_TYPE_MASK));
+ }
+
+ private FastAdvertisementUtils() {}
+}
diff --git a/nearby/service/java/com/android/server/nearby/presence/PresenceDiscoveryResult.java b/nearby/service/java/com/android/server/nearby/presence/PresenceDiscoveryResult.java
index 7a77aa9..e48074d 100644
--- a/nearby/service/java/com/android/server/nearby/presence/PresenceDiscoveryResult.java
+++ b/nearby/service/java/com/android/server/nearby/presence/PresenceDiscoveryResult.java
@@ -79,10 +79,13 @@
* Converts a presence device from the discovery result.
*/
public PresenceDevice toPresenceDevice() {
- return new PresenceDevice.Builder()
+ return new PresenceDevice.Builder(
+ // Use the public credential hash as the device Id.
+ String.valueOf(mPublicCredential.hashCode()),
+ mSalt,
+ mPublicCredential.getSecretId(),
+ mPublicCredential.getEncryptedMetadata())
.setRssi(mRssi)
- .setSalt(mSalt)
- .setSecretId(mPublicCredential.getSecretId())
.addMedium(NearbyDevice.Medium.BLE).build();
}
diff --git a/nearby/service/java/com/android/server/nearby/provider/BleBroadcastProvider.java b/nearby/service/java/com/android/server/nearby/provider/BleBroadcastProvider.java
new file mode 100644
index 0000000..40fc46f
--- /dev/null
+++ b/nearby/service/java/com/android/server/nearby/provider/BleBroadcastProvider.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2022 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 com.android.server.nearby.provider;
+
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.le.AdvertiseCallback;
+import android.bluetooth.le.AdvertiseData;
+import android.bluetooth.le.AdvertiseSettings;
+import android.bluetooth.le.BluetoothLeAdvertiser;
+import android.nearby.BroadcastCallback;
+import android.os.ParcelUuid;
+
+import com.android.server.nearby.injector.Injector;
+import com.android.server.nearby.presence.PresenceConstants;
+
+/**
+ * A provider for Bluetooth Low Energy advertisement.
+ */
+public class BleBroadcastProvider extends AdvertiseCallback {
+
+ /**
+ * Listener for Broadcast status changes.
+ */
+ interface BroadcastListener {
+ void onStatusChanged(int status);
+ }
+
+ private final Injector mInjector;
+ private BroadcastListener mBroadcastListener;
+ private boolean mIsAdvertising;
+
+ BleBroadcastProvider(Injector injector) {
+ mInjector = injector;
+ }
+
+ void start(byte[] advertisementPackets, BroadcastListener listener) {
+
+ if (mIsAdvertising) {
+ stop();
+ }
+ boolean advertiseStarted = false;
+ BluetoothAdapter adapter = mInjector.getBluetoothAdapter();
+ if (adapter != null) {
+ BluetoothLeAdvertiser bluetoothLeAdvertiser =
+ mInjector.getBluetoothAdapter().getBluetoothLeAdvertiser();
+ if (bluetoothLeAdvertiser != null) {
+ advertiseStarted = true;
+ AdvertiseSettings settings =
+ new AdvertiseSettings.Builder()
+ .setAdvertiseMode(AdvertiseSettings.ADVERTISE_MODE_BALANCED)
+ .setTxPowerLevel(AdvertiseSettings.ADVERTISE_TX_POWER_MEDIUM)
+ .setConnectable(true)
+ .build();
+ AdvertiseData advertiseData =
+ new AdvertiseData.Builder()
+ .addServiceData(new ParcelUuid(PresenceConstants.PRESENCE_UUID),
+ advertisementPackets).build();
+
+ try {
+ mBroadcastListener = listener;
+ bluetoothLeAdvertiser.startAdvertising(settings, advertiseData, this);
+ } catch (NullPointerException | IllegalStateException | SecurityException e) {
+ advertiseStarted = false;
+ }
+ }
+ }
+ if (!advertiseStarted) {
+ listener.onStatusChanged(BroadcastCallback.STATUS_FAILURE);
+ }
+ }
+
+ void stop() {
+ if (mIsAdvertising) {
+ BluetoothAdapter adapter = mInjector.getBluetoothAdapter();
+ if (adapter != null) {
+ BluetoothLeAdvertiser bluetoothLeAdvertiser =
+ mInjector.getBluetoothAdapter().getBluetoothLeAdvertiser();
+ if (bluetoothLeAdvertiser != null) {
+ bluetoothLeAdvertiser.stopAdvertising(this);
+ }
+ }
+ mBroadcastListener = null;
+ mIsAdvertising = false;
+ }
+ }
+
+ @Override
+ public void onStartSuccess(AdvertiseSettings settingsInEffect) {
+ if (mBroadcastListener != null) {
+ mBroadcastListener.onStatusChanged(BroadcastCallback.STATUS_OK);
+ }
+ }
+
+ @Override
+ public void onStartFailure(int errorCode) {
+ if (mBroadcastListener != null) {
+ mBroadcastListener.onStatusChanged(BroadcastCallback.STATUS_FAILURE);
+ }
+ }
+}
diff --git a/nearby/service/java/com/android/server/nearby/provider/BroadcastProviderManager.java b/nearby/service/java/com/android/server/nearby/provider/BroadcastProviderManager.java
new file mode 100644
index 0000000..6a0f637
--- /dev/null
+++ b/nearby/service/java/com/android/server/nearby/provider/BroadcastProviderManager.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright (C) 2022 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 com.android.server.nearby.provider;
+
+import android.content.Context;
+import android.nearby.BroadcastCallback;
+import android.nearby.BroadcastRequest;
+import android.nearby.IBroadcastListener;
+import android.nearby.PresenceBroadcastRequest;
+import android.os.RemoteException;
+import android.util.Log;
+
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.server.nearby.NearbyConfiguration;
+import com.android.server.nearby.injector.Injector;
+import com.android.server.nearby.presence.FastAdvertisement;
+import com.android.server.nearby.util.ForegroundThread;
+
+import java.util.concurrent.Executor;
+
+/**
+ * A manager for nearby broadcasts.
+ */
+public class BroadcastProviderManager implements BleBroadcastProvider.BroadcastListener {
+
+ private static final String TAG = "BroadcastProvider";
+
+ private final Object mLock;
+ private final BleBroadcastProvider mBleBroadcastProvider;
+ private final Executor mExecutor;
+ private final NearbyConfiguration mNearbyConfiguration;
+
+ private IBroadcastListener mBroadcastListener;
+
+ public BroadcastProviderManager(Context context, Injector injector) {
+ this(ForegroundThread.getExecutor(), new BleBroadcastProvider(injector));
+ }
+
+ @VisibleForTesting
+ BroadcastProviderManager(Executor executor, BleBroadcastProvider bleBroadcastProvider) {
+ mExecutor = executor;
+ mBleBroadcastProvider = bleBroadcastProvider;
+ mLock = new Object();
+ mNearbyConfiguration = new NearbyConfiguration();
+ mBroadcastListener = null;
+ }
+
+ /**
+ * Starts a nearby broadcast, the callback is sent through the given listener.
+ */
+ public void startBroadcast(BroadcastRequest broadcastRequest, IBroadcastListener listener) {
+ synchronized (mLock) {
+ if (!mNearbyConfiguration.isPresenceBroadcastLegacyEnabled()) {
+ reportBroadcastStatus(listener, BroadcastCallback.STATUS_FAILURE);
+ return;
+ }
+ if (broadcastRequest.getType() != BroadcastRequest.BROADCAST_TYPE_NEARBY_PRESENCE) {
+ reportBroadcastStatus(listener, BroadcastCallback.STATUS_FAILURE);
+ return;
+ }
+ PresenceBroadcastRequest presenceBroadcastRequest =
+ (PresenceBroadcastRequest) broadcastRequest;
+ if (presenceBroadcastRequest.getVersion() != BroadcastRequest.PRESENCE_VERSION_V0) {
+ reportBroadcastStatus(listener, BroadcastCallback.STATUS_FAILURE);
+ return;
+ }
+ FastAdvertisement fastAdvertisement = FastAdvertisement.createFromRequest(
+ presenceBroadcastRequest);
+ byte[] advertisementPackets = fastAdvertisement.toBytes();
+ mBroadcastListener = listener;
+ mExecutor.execute(() -> {
+ mBleBroadcastProvider.start(advertisementPackets, this);
+ });
+ }
+ }
+
+ /**
+ * Stops the nearby broadcast.
+ */
+ public void stopBroadcast(IBroadcastListener listener) {
+ synchronized (mLock) {
+ if (!mNearbyConfiguration.isPresenceBroadcastLegacyEnabled()) {
+ reportBroadcastStatus(listener, BroadcastCallback.STATUS_FAILURE);
+ return;
+ }
+ mBroadcastListener = null;
+ mExecutor.execute(() -> mBleBroadcastProvider.stop());
+ }
+ }
+
+ @Override
+ public void onStatusChanged(int status) {
+ IBroadcastListener listener = null;
+ synchronized (mLock) {
+ listener = mBroadcastListener;
+ }
+ // Don't invoke callback while holding the local lock, as this could cause deadlock.
+ if (listener != null) {
+ reportBroadcastStatus(listener, status);
+ }
+ }
+
+ private void reportBroadcastStatus(IBroadcastListener listener, int status) {
+ try {
+ listener.onStatusChanged(status);
+ } catch (RemoteException exception) {
+ Log.e(TAG, "remote exception when reporting status");
+ }
+ }
+}
diff --git a/nearby/service/java/com/android/server/nearby/provider/FastPairDataProvider.java b/nearby/service/java/com/android/server/nearby/provider/FastPairDataProvider.java
index f4db578..35cb5d8 100644
--- a/nearby/service/java/com/android/server/nearby/provider/FastPairDataProvider.java
+++ b/nearby/service/java/com/android/server/nearby/provider/FastPairDataProvider.java
@@ -22,7 +22,7 @@
import android.nearby.FastPairDataProviderBase;
import android.nearby.aidl.ByteArrayParcel;
import android.nearby.aidl.FastPairAccountDevicesMetadataRequestParcel;
-import android.nearby.aidl.FastPairAntispoofkeyDeviceMetadataRequestParcel;
+import android.nearby.aidl.FastPairAntispoofKeyDeviceMetadataRequestParcel;
import android.nearby.aidl.FastPairEligibleAccountsRequestParcel;
import android.nearby.aidl.FastPairManageAccountDeviceRequestParcel;
import android.nearby.aidl.FastPairManageAccountRequestParcel;
@@ -81,20 +81,20 @@
}
/**
- * Loads FastPairAntispoofkeyDeviceMetadata.
+ * Loads FastPairAntispoofKeyDeviceMetadata.
*
* @throws IllegalStateException If ProxyFastPairDataProvider is not available.
*/
@WorkerThread
@Nullable
- public Rpcs.GetObservedDeviceResponse loadFastPairAntispoofkeyDeviceMetadata(byte[] modelId) {
+ public Rpcs.GetObservedDeviceResponse loadFastPairAntispoofKeyDeviceMetadata(byte[] modelId) {
if (mProxyFastPairDataProvider != null) {
- FastPairAntispoofkeyDeviceMetadataRequestParcel requestParcel =
- new FastPairAntispoofkeyDeviceMetadataRequestParcel();
+ FastPairAntispoofKeyDeviceMetadataRequestParcel requestParcel =
+ new FastPairAntispoofKeyDeviceMetadataRequestParcel();
requestParcel.modelId = modelId;
return Utils.convertToGetObservedDeviceResponse(
mProxyFastPairDataProvider
- .loadFastPairAntispoofkeyDeviceMetadata(requestParcel));
+ .loadFastPairAntispoofKeyDeviceMetadata(requestParcel));
}
throw new IllegalStateException("No ProxyFastPairDataProvider yet constructed");
}
diff --git a/nearby/service/java/com/android/server/nearby/provider/ProxyFastPairDataProvider.java b/nearby/service/java/com/android/server/nearby/provider/ProxyFastPairDataProvider.java
index 36b4478..f0ade6c 100644
--- a/nearby/service/java/com/android/server/nearby/provider/ProxyFastPairDataProvider.java
+++ b/nearby/service/java/com/android/server/nearby/provider/ProxyFastPairDataProvider.java
@@ -20,14 +20,14 @@
import android.content.Context;
import android.nearby.aidl.FastPairAccountDevicesMetadataRequestParcel;
import android.nearby.aidl.FastPairAccountKeyDeviceMetadataParcel;
-import android.nearby.aidl.FastPairAntispoofkeyDeviceMetadataParcel;
-import android.nearby.aidl.FastPairAntispoofkeyDeviceMetadataRequestParcel;
+import android.nearby.aidl.FastPairAntispoofKeyDeviceMetadataParcel;
+import android.nearby.aidl.FastPairAntispoofKeyDeviceMetadataRequestParcel;
import android.nearby.aidl.FastPairEligibleAccountParcel;
import android.nearby.aidl.FastPairEligibleAccountsRequestParcel;
import android.nearby.aidl.FastPairManageAccountDeviceRequestParcel;
import android.nearby.aidl.FastPairManageAccountRequestParcel;
import android.nearby.aidl.IFastPairAccountDevicesMetadataCallback;
-import android.nearby.aidl.IFastPairAntispoofkeyDeviceMetadataCallback;
+import android.nearby.aidl.IFastPairAntispoofKeyDeviceMetadataCallback;
import android.nearby.aidl.IFastPairDataProvider;
import android.nearby.aidl.IFastPairEligibleAccountsCallback;
import android.nearby.aidl.IFastPairManageAccountCallback;
@@ -218,25 +218,25 @@
}
/**
- * Invokes system api loadFastPairAntispoofkeyDeviceMetadata.
+ * Invokes system api loadFastPairAntispoofKeyDeviceMetadata.
*
* @return the Fast Pair AntispoofKeyDeviceMetadata of a given device.
*/
@WorkerThread
@Nullable
- FastPairAntispoofkeyDeviceMetadataParcel loadFastPairAntispoofkeyDeviceMetadata(
- FastPairAntispoofkeyDeviceMetadataRequestParcel requestParcel) {
+ FastPairAntispoofKeyDeviceMetadataParcel loadFastPairAntispoofKeyDeviceMetadata(
+ FastPairAntispoofKeyDeviceMetadataRequestParcel requestParcel) {
final CountDownLatch waitForCompletionLatch = new CountDownLatch(1);
- final AtomicReference<FastPairAntispoofkeyDeviceMetadataParcel> response =
+ final AtomicReference<FastPairAntispoofKeyDeviceMetadataParcel> response =
new AtomicReference<>();
mServiceMonitor.runOnBinder(new ServiceMonitor.BinderOperation() {
@Override
public void run(IBinder binder) throws RemoteException {
IFastPairDataProvider provider = IFastPairDataProvider.Stub.asInterface(binder);
- IFastPairAntispoofkeyDeviceMetadataCallback callback =
- new IFastPairAntispoofkeyDeviceMetadataCallback.Stub() {
- public void onFastPairAntispoofkeyDeviceMetadataReceived(
- FastPairAntispoofkeyDeviceMetadataParcel metadata) {
+ IFastPairAntispoofKeyDeviceMetadataCallback callback =
+ new IFastPairAntispoofKeyDeviceMetadataCallback.Stub() {
+ public void onFastPairAntispoofKeyDeviceMetadataReceived(
+ FastPairAntispoofKeyDeviceMetadataParcel metadata) {
response.set(metadata);
waitForCompletionLatch.countDown();
}
@@ -245,7 +245,7 @@
waitForCompletionLatch.countDown();
}
};
- provider.loadFastPairAntispoofkeyDeviceMetadata(requestParcel, callback);
+ provider.loadFastPairAntispoofKeyDeviceMetadata(requestParcel, callback);
}
@Override
diff --git a/nearby/service/java/com/android/server/nearby/provider/Utils.java b/nearby/service/java/com/android/server/nearby/provider/Utils.java
index b84dfe9..2c0cde6 100644
--- a/nearby/service/java/com/android/server/nearby/provider/Utils.java
+++ b/nearby/service/java/com/android/server/nearby/provider/Utils.java
@@ -19,7 +19,7 @@
import android.accounts.Account;
import android.annotation.Nullable;
import android.nearby.aidl.FastPairAccountKeyDeviceMetadataParcel;
-import android.nearby.aidl.FastPairAntispoofkeyDeviceMetadataParcel;
+import android.nearby.aidl.FastPairAntispoofKeyDeviceMetadataParcel;
import android.nearby.aidl.FastPairDeviceMetadataParcel;
import android.nearby.aidl.FastPairDiscoveryItemParcel;
import android.nearby.aidl.FastPairEligibleAccountParcel;
@@ -298,7 +298,7 @@
}
private static @Nullable Rpcs.Device convertToDevice(
- FastPairAntispoofkeyDeviceMetadataParcel metadata) {
+ FastPairAntispoofKeyDeviceMetadataParcel metadata) {
Rpcs.Device.Builder deviceBuilder = Rpcs.Device.newBuilder();
if (metadata.antiSpoofPublicKey != null) {
@@ -341,7 +341,7 @@
}
private static @Nullable ByteString convertToImage(
- FastPairAntispoofkeyDeviceMetadataParcel metadata) {
+ FastPairAntispoofKeyDeviceMetadataParcel metadata) {
if (metadata.deviceMetadata == null || metadata.deviceMetadata.image == null) {
return null;
}
@@ -350,7 +350,7 @@
}
private static @Nullable Rpcs.ObservedDeviceStrings
- convertToObservedDeviceStrings(FastPairAntispoofkeyDeviceMetadataParcel metadata) {
+ convertToObservedDeviceStrings(FastPairAntispoofKeyDeviceMetadataParcel metadata) {
if (metadata.deviceMetadata == null) {
return null;
}
@@ -455,7 +455,7 @@
static @Nullable Rpcs.GetObservedDeviceResponse
convertToGetObservedDeviceResponse(
- @Nullable FastPairAntispoofkeyDeviceMetadataParcel metadata) {
+ @Nullable FastPairAntispoofKeyDeviceMetadataParcel metadata) {
if (metadata == null) {
return null;
}
diff --git a/nearby/tests/cts/fastpair/src/android/nearby/cts/FastPairDataProviderBaseTest.java b/nearby/tests/cts/fastpair/src/android/nearby/cts/FastPairDataProviderBaseTest.java
index fd9e294..68418f2 100644
--- a/nearby/tests/cts/fastpair/src/android/nearby/cts/FastPairDataProviderBaseTest.java
+++ b/nearby/tests/cts/fastpair/src/android/nearby/cts/FastPairDataProviderBaseTest.java
@@ -25,7 +25,7 @@
import android.accounts.Account;
import android.nearby.FastPairAccountKeyDeviceMetadata;
-import android.nearby.FastPairAntispoofkeyDeviceMetadata;
+import android.nearby.FastPairAntispoofKeyDeviceMetadata;
import android.nearby.FastPairDataProviderBase;
import android.nearby.FastPairDeviceMetadata;
import android.nearby.FastPairDiscoveryItem;
@@ -33,8 +33,8 @@
import android.nearby.aidl.ByteArrayParcel;
import android.nearby.aidl.FastPairAccountDevicesMetadataRequestParcel;
import android.nearby.aidl.FastPairAccountKeyDeviceMetadataParcel;
-import android.nearby.aidl.FastPairAntispoofkeyDeviceMetadataParcel;
-import android.nearby.aidl.FastPairAntispoofkeyDeviceMetadataRequestParcel;
+import android.nearby.aidl.FastPairAntispoofKeyDeviceMetadataParcel;
+import android.nearby.aidl.FastPairAntispoofKeyDeviceMetadataRequestParcel;
import android.nearby.aidl.FastPairDeviceMetadataParcel;
import android.nearby.aidl.FastPairDiscoveryItemParcel;
import android.nearby.aidl.FastPairEligibleAccountParcel;
@@ -42,7 +42,7 @@
import android.nearby.aidl.FastPairManageAccountDeviceRequestParcel;
import android.nearby.aidl.FastPairManageAccountRequestParcel;
import android.nearby.aidl.IFastPairAccountDevicesMetadataCallback;
-import android.nearby.aidl.IFastPairAntispoofkeyDeviceMetadataCallback;
+import android.nearby.aidl.IFastPairAntispoofKeyDeviceMetadataCallback;
import android.nearby.aidl.IFastPairDataProvider;
import android.nearby.aidl.IFastPairEligibleAccountsCallback;
import android.nearby.aidl.IFastPairManageAccountCallback;
@@ -178,9 +178,9 @@
genHappyPathFastPairAccountkeyDeviceMetadata(),
genHappyPathFastPairAccountkeyDeviceMetadata());
- private static final FastPairAntispoofkeyDeviceMetadataRequestParcel
+ private static final FastPairAntispoofKeyDeviceMetadataRequestParcel
FAST_PAIR_ANTI_SPOOF_KEY_DEVICE_METADATA_REQUEST_PARCEL =
- genFastPairAntispoofkeyDeviceMetadataRequestParcel();
+ genFastPairAntispoofKeyDeviceMetadataRequestParcel();
private static final FastPairAccountDevicesMetadataRequestParcel
FAST_PAIR_ACCOUNT_DEVICES_METADATA_REQUEST_PARCEL =
genFastPairAccountDevicesMetadataRequestParcel();
@@ -193,9 +193,9 @@
private static final FastPairManageAccountDeviceRequestParcel
FAST_PAIR_MANAGE_ACCOUNT_DEVICE_REQUEST_PARCEL =
genFastPairManageAccountDeviceRequestParcel();
- private static final FastPairAntispoofkeyDeviceMetadata
+ private static final FastPairAntispoofKeyDeviceMetadata
HAPPY_PATH_FAST_PAIR_ANTI_SPOOF_KEY_DEVICE_METADATA =
- genHappyPathFastPairAntispoofkeyDeviceMetadata();
+ genHappyPathFastPairAntispoofKeyDeviceMetadata();
@Captor private ArgumentCaptor<FastPairEligibleAccountParcel[]>
mFastPairEligibleAccountParcelsArgumentCaptor;
@@ -203,8 +203,8 @@
mFastPairAccountKeyDeviceMetadataParcelsArgumentCaptor;
@Mock private FastPairDataProviderBase mMockFastPairDataProviderBase;
- @Mock private IFastPairAntispoofkeyDeviceMetadataCallback.Stub
- mAntispoofkeyDeviceMetadataCallback;
+ @Mock private IFastPairAntispoofKeyDeviceMetadataCallback.Stub
+ mAntispoofKeyDeviceMetadataCallback;
@Mock private IFastPairAccountDevicesMetadataCallback.Stub mAccountDevicesMetadataCallback;
@Mock private IFastPairEligibleAccountsCallback.Stub mEligibleAccountsCallback;
@Mock private IFastPairManageAccountCallback.Stub mManageAccountCallback;
@@ -225,29 +225,29 @@
@Test
@SdkSuppress(minSdkVersion = 32, codeName = "T")
- public void testHappyPathLoadFastPairAntispoofkeyDeviceMetadata() throws Exception {
+ public void testHappyPathLoadFastPairAntispoofKeyDeviceMetadata() throws Exception {
// AOSP sends calls to OEM via Parcelable.
- mHappyPathFastPairDataProvider.asProvider().loadFastPairAntispoofkeyDeviceMetadata(
+ mHappyPathFastPairDataProvider.asProvider().loadFastPairAntispoofKeyDeviceMetadata(
FAST_PAIR_ANTI_SPOOF_KEY_DEVICE_METADATA_REQUEST_PARCEL,
- mAntispoofkeyDeviceMetadataCallback);
+ mAntispoofKeyDeviceMetadataCallback);
// OEM receives request and verifies that it is as expected.
- final ArgumentCaptor<FastPairDataProviderBase.FastPairAntispoofkeyDeviceMetadataRequest>
- fastPairAntispoofkeyDeviceMetadataRequestCaptor =
+ final ArgumentCaptor<FastPairDataProviderBase.FastPairAntispoofKeyDeviceMetadataRequest>
+ fastPairAntispoofKeyDeviceMetadataRequestCaptor =
ArgumentCaptor.forClass(
- FastPairDataProviderBase.FastPairAntispoofkeyDeviceMetadataRequest.class);
- verify(mMockFastPairDataProviderBase).onLoadFastPairAntispoofkeyDeviceMetadata(
- fastPairAntispoofkeyDeviceMetadataRequestCaptor.capture(),
- any(FastPairDataProviderBase.FastPairAntispoofkeyDeviceMetadataCallback.class));
- ensureHappyPathAsExpected(fastPairAntispoofkeyDeviceMetadataRequestCaptor.getValue());
+ FastPairDataProviderBase.FastPairAntispoofKeyDeviceMetadataRequest.class);
+ verify(mMockFastPairDataProviderBase).onLoadFastPairAntispoofKeyDeviceMetadata(
+ fastPairAntispoofKeyDeviceMetadataRequestCaptor.capture(),
+ any(FastPairDataProviderBase.FastPairAntispoofKeyDeviceMetadataCallback.class));
+ ensureHappyPathAsExpected(fastPairAntispoofKeyDeviceMetadataRequestCaptor.getValue());
// AOSP receives responses and verifies that it is as expected.
- final ArgumentCaptor<FastPairAntispoofkeyDeviceMetadataParcel>
- fastPairAntispoofkeyDeviceMetadataParcelCaptor =
- ArgumentCaptor.forClass(FastPairAntispoofkeyDeviceMetadataParcel.class);
- verify(mAntispoofkeyDeviceMetadataCallback).onFastPairAntispoofkeyDeviceMetadataReceived(
- fastPairAntispoofkeyDeviceMetadataParcelCaptor.capture());
- ensureHappyPathAsExpected(fastPairAntispoofkeyDeviceMetadataParcelCaptor.getValue());
+ final ArgumentCaptor<FastPairAntispoofKeyDeviceMetadataParcel>
+ fastPairAntispoofKeyDeviceMetadataParcelCaptor =
+ ArgumentCaptor.forClass(FastPairAntispoofKeyDeviceMetadataParcel.class);
+ verify(mAntispoofKeyDeviceMetadataCallback).onFastPairAntispoofKeyDeviceMetadataReceived(
+ fastPairAntispoofKeyDeviceMetadataParcelCaptor.capture());
+ ensureHappyPathAsExpected(fastPairAntispoofKeyDeviceMetadataParcelCaptor.getValue());
}
@Test
@@ -345,14 +345,14 @@
@Test
@SdkSuppress(minSdkVersion = 32, codeName = "T")
- public void testErrorPathLoadFastPairAntispoofkeyDeviceMetadata() throws Exception {
- mErrorPathFastPairDataProvider.asProvider().loadFastPairAntispoofkeyDeviceMetadata(
+ public void testErrorPathLoadFastPairAntispoofKeyDeviceMetadata() throws Exception {
+ mErrorPathFastPairDataProvider.asProvider().loadFastPairAntispoofKeyDeviceMetadata(
FAST_PAIR_ANTI_SPOOF_KEY_DEVICE_METADATA_REQUEST_PARCEL,
- mAntispoofkeyDeviceMetadataCallback);
- verify(mMockFastPairDataProviderBase).onLoadFastPairAntispoofkeyDeviceMetadata(
- any(FastPairDataProviderBase.FastPairAntispoofkeyDeviceMetadataRequest.class),
- any(FastPairDataProviderBase.FastPairAntispoofkeyDeviceMetadataCallback.class));
- verify(mAntispoofkeyDeviceMetadataCallback).onError(
+ mAntispoofKeyDeviceMetadataCallback);
+ verify(mMockFastPairDataProviderBase).onLoadFastPairAntispoofKeyDeviceMetadata(
+ any(FastPairDataProviderBase.FastPairAntispoofKeyDeviceMetadataRequest.class),
+ any(FastPairDataProviderBase.FastPairAntispoofKeyDeviceMetadataCallback.class));
+ verify(mAntispoofKeyDeviceMetadataCallback).onError(
eq(ERROR_CODE_BAD_REQUEST), eq(ERROR_STRING));
}
@@ -420,12 +420,12 @@
}
@Override
- public void onLoadFastPairAntispoofkeyDeviceMetadata(
- @NonNull FastPairAntispoofkeyDeviceMetadataRequest request,
- @NonNull FastPairAntispoofkeyDeviceMetadataCallback callback) {
- mMockFastPairDataProviderBase.onLoadFastPairAntispoofkeyDeviceMetadata(
+ public void onLoadFastPairAntispoofKeyDeviceMetadata(
+ @NonNull FastPairAntispoofKeyDeviceMetadataRequest request,
+ @NonNull FastPairAntispoofKeyDeviceMetadataCallback callback) {
+ mMockFastPairDataProviderBase.onLoadFastPairAntispoofKeyDeviceMetadata(
request, callback);
- callback.onFastPairAntispoofkeyDeviceMetadataReceived(
+ callback.onFastPairAntispoofKeyDeviceMetadataReceived(
HAPPY_PATH_FAST_PAIR_ANTI_SPOOF_KEY_DEVICE_METADATA);
}
@@ -478,10 +478,10 @@
}
@Override
- public void onLoadFastPairAntispoofkeyDeviceMetadata(
- @NonNull FastPairAntispoofkeyDeviceMetadataRequest request,
- @NonNull FastPairAntispoofkeyDeviceMetadataCallback callback) {
- mMockFastPairDataProviderBase.onLoadFastPairAntispoofkeyDeviceMetadata(
+ public void onLoadFastPairAntispoofKeyDeviceMetadata(
+ @NonNull FastPairAntispoofKeyDeviceMetadataRequest request,
+ @NonNull FastPairAntispoofKeyDeviceMetadataCallback callback) {
+ mMockFastPairDataProviderBase.onLoadFastPairAntispoofKeyDeviceMetadata(
request, callback);
callback.onError(ERROR_CODE_BAD_REQUEST, ERROR_STRING);
}
@@ -519,11 +519,11 @@
}
}
- /* Generates AntispoofkeyDeviceMetadataRequestParcel. */
- private static FastPairAntispoofkeyDeviceMetadataRequestParcel
- genFastPairAntispoofkeyDeviceMetadataRequestParcel() {
- FastPairAntispoofkeyDeviceMetadataRequestParcel requestParcel =
- new FastPairAntispoofkeyDeviceMetadataRequestParcel();
+ /* Generates AntispoofKeyDeviceMetadataRequestParcel. */
+ private static FastPairAntispoofKeyDeviceMetadataRequestParcel
+ genFastPairAntispoofKeyDeviceMetadataRequestParcel() {
+ FastPairAntispoofKeyDeviceMetadataRequestParcel requestParcel =
+ new FastPairAntispoofKeyDeviceMetadataRequestParcel();
requestParcel.modelId = REQUEST_MODEL_ID;
return requestParcel;
@@ -579,11 +579,11 @@
return requestParcel;
}
- /* Generates Happy Path AntispoofkeyDeviceMetadata. */
- private static FastPairAntispoofkeyDeviceMetadata
- genHappyPathFastPairAntispoofkeyDeviceMetadata() {
- FastPairAntispoofkeyDeviceMetadata.Builder builder =
- new FastPairAntispoofkeyDeviceMetadata.Builder();
+ /* Generates Happy Path AntispoofKeyDeviceMetadata. */
+ private static FastPairAntispoofKeyDeviceMetadata
+ genHappyPathFastPairAntispoofKeyDeviceMetadata() {
+ FastPairAntispoofKeyDeviceMetadata.Builder builder =
+ new FastPairAntispoofKeyDeviceMetadata.Builder();
builder.setAntiSpoofPublicKey(ANTI_SPOOFING_KEY);
builder.setFastPairDeviceMetadata(genHappyPathFastPairDeviceMetadata());
@@ -791,9 +791,9 @@
return builder.build();
}
- /* Verifies Happy Path AntispoofkeyDeviceMetadataRequest. */
+ /* Verifies Happy Path AntispoofKeyDeviceMetadataRequest. */
private static void ensureHappyPathAsExpected(
- FastPairDataProviderBase.FastPairAntispoofkeyDeviceMetadataRequest request) {
+ FastPairDataProviderBase.FastPairAntispoofKeyDeviceMetadataRequest request) {
assertThat(request.getModelId()).isEqualTo(REQUEST_MODEL_ID);
}
@@ -829,9 +829,9 @@
ensureHappyPathAsExpected(request.getAccountKeyDeviceMetadata());
}
- /* Verifies Happy Path AntispoofkeyDeviceMetadataParcel. */
+ /* Verifies Happy Path AntispoofKeyDeviceMetadataParcel. */
private static void ensureHappyPathAsExpected(
- FastPairAntispoofkeyDeviceMetadataParcel metadataParcel) {
+ FastPairAntispoofKeyDeviceMetadataParcel metadataParcel) {
assertThat(metadataParcel).isNotNull();
assertThat(metadataParcel.antiSpoofPublicKey).isEqualTo(ANTI_SPOOFING_KEY);
ensureHappyPathAsExpected(metadataParcel.deviceMetadata);
diff --git a/nearby/tests/cts/fastpair/src/android/nearby/cts/NearbyManagerTest.java b/nearby/tests/cts/fastpair/src/android/nearby/cts/NearbyManagerTest.java
index eedcce1..9dd4a93 100644
--- a/nearby/tests/cts/fastpair/src/android/nearby/cts/NearbyManagerTest.java
+++ b/nearby/tests/cts/fastpair/src/android/nearby/cts/NearbyManagerTest.java
@@ -106,8 +106,8 @@
.setIdentityType(IDENTITY_TYPE_PRIVATE)
.build();
BroadcastRequest broadcastRequest =
- new PresenceBroadcastRequest.Builder(Collections.singletonList(BLE_MEDIUM), SALT)
- .setCredential(credential)
+ new PresenceBroadcastRequest.Builder(
+ Collections.singletonList(BLE_MEDIUM), SALT, credential)
.build();
BroadcastCallback callback = status -> {
diff --git a/nearby/tests/cts/fastpair/src/android/nearby/cts/PresenceBroadcastRequestTest.java b/nearby/tests/cts/fastpair/src/android/nearby/cts/PresenceBroadcastRequestTest.java
index 67d5aa4..3c831a2 100644
--- a/nearby/tests/cts/fastpair/src/android/nearby/cts/PresenceBroadcastRequestTest.java
+++ b/nearby/tests/cts/fastpair/src/android/nearby/cts/PresenceBroadcastRequestTest.java
@@ -66,10 +66,10 @@
.setMetadataEncryptionKey(METADATA_ENCRYPTION_KEY)
.build();
DataElement element = new DataElement(KEY, VALUE);
- mBuilder = new PresenceBroadcastRequest.Builder(Collections.singletonList(BLE_MEDIUM), SALT)
+ mBuilder = new PresenceBroadcastRequest.Builder(Collections.singletonList(BLE_MEDIUM), SALT,
+ credential)
.setTxPower(TX_POWER)
.setVersion(VERSION)
- .setCredential(credential)
.addAction(ACTION_ID)
.addExtendedProperty(element);
}
diff --git a/nearby/tests/cts/fastpair/src/android/nearby/cts/PresenceDeviceTest.java b/nearby/tests/cts/fastpair/src/android/nearby/cts/PresenceDeviceTest.java
index e0d9200..5fefc68 100644
--- a/nearby/tests/cts/fastpair/src/android/nearby/cts/PresenceDeviceTest.java
+++ b/nearby/tests/cts/fastpair/src/android/nearby/cts/PresenceDeviceTest.java
@@ -55,19 +55,16 @@
@Test
@SdkSuppress(minSdkVersion = 32, codeName = "T")
public void testBuilder() {
- PresenceDevice device = new PresenceDevice.Builder()
- .setDeviceType(DEVICE_TYPE)
- .setDeviceId(DEVICE_ID)
- .setDeviceImageUrl(IMAGE_URL)
- .addExtendedProperty(new DataElement(KEY, VALUE))
- .setRssi(RSSI)
- .addMedium(MEDIUM)
- .setName(DEVICE_NAME)
- .setDiscoveryTimestampMillis(DISCOVERY_MILLIS)
- .setSalt(SALT)
- .setSecretId(SECRET_ID)
- .setEncryptedIdentity(ENCRYPTED_IDENTITY)
- .build();
+ PresenceDevice device =
+ new PresenceDevice.Builder(DEVICE_ID, SALT, SECRET_ID, ENCRYPTED_IDENTITY)
+ .setDeviceType(DEVICE_TYPE)
+ .setDeviceImageUrl(IMAGE_URL)
+ .addExtendedProperty(new DataElement(KEY, VALUE))
+ .setRssi(RSSI)
+ .addMedium(MEDIUM)
+ .setName(DEVICE_NAME)
+ .setDiscoveryTimestampMillis(DISCOVERY_MILLIS)
+ .build();
assertThat(device.getDeviceType()).isEqualTo(DEVICE_TYPE);
assertThat(device.getDeviceId()).isEqualTo(DEVICE_ID);
@@ -87,13 +84,13 @@
@Test
@SdkSuppress(minSdkVersion = 32, codeName = "T")
public void testWriteParcel() {
- PresenceDevice device = new PresenceDevice.Builder()
- .setDeviceId(DEVICE_ID)
- .addExtendedProperty(new DataElement(KEY, VALUE))
- .setRssi(RSSI)
- .addMedium(MEDIUM)
- .setName(DEVICE_NAME)
- .build();
+ PresenceDevice device =
+ new PresenceDevice.Builder(DEVICE_ID, SALT, SECRET_ID, ENCRYPTED_IDENTITY)
+ .addExtendedProperty(new DataElement(KEY, VALUE))
+ .setRssi(RSSI)
+ .addMedium(MEDIUM)
+ .setName(DEVICE_NAME)
+ .build();
Parcel parcel = Parcel.obtain();
device.writeToParcel(parcel, 0);
diff --git a/nearby/tests/multidevices/clients/src/android/nearby/multidevices/fastpair/seeker/FastPairSeekerSnippet.kt b/nearby/tests/multidevices/clients/src/android/nearby/multidevices/fastpair/seeker/FastPairSeekerSnippet.kt
index 8f5d120..4381d51 100644
--- a/nearby/tests/multidevices/clients/src/android/nearby/multidevices/fastpair/seeker/FastPairSeekerSnippet.kt
+++ b/nearby/tests/multidevices/clients/src/android/nearby/multidevices/fastpair/seeker/FastPairSeekerSnippet.kt
@@ -73,15 +73,15 @@
appContext.sendBroadcast(scanIntent)
}
- /** Puts a model id to FastPairAntiSpoofKeyDeviceMetadata pair into test data cache.
+ /** Puts a model id to FastPairAntispoofKeyDeviceMetadata pair into test data cache.
*
* @param modelId a string of model id to be associated with.
- * @param json a string of FastPairAntiSpoofKeyDeviceMetadata JSON object.
+ * @param json a string of FastPairAntispoofKeyDeviceMetadata JSON object.
*/
- @Rpc(description = "Puts a model id to FastPairAntiSpoofKeyDeviceMetadata pair into test data cache.")
- fun putAntiSpoofKeyDeviceMetadata(modelId: String, json: String) {
- Log.i("Puts a model id to FastPairAntiSpoofKeyDeviceMetadata pair into test data cache.")
- FastPairTestDataCache.putAntiSpoofKeyDeviceMetadata(modelId, json)
+ @Rpc(description = "Puts a model id to FastPairAntispoofKeyDeviceMetadata pair into test data cache.")
+ fun putAntispoofKeyDeviceMetadata(modelId: String, json: String) {
+ Log.i("Puts a model id to FastPairAntispoofKeyDeviceMetadata pair into test data cache.")
+ FastPairTestDataCache.putAntispoofKeyDeviceMetadata(modelId, json)
}
/** Puts an array of FastPairAccountKeyDeviceMetadata into test data cache.
diff --git a/nearby/tests/multidevices/clients/src/android/nearby/multidevices/fastpair/seeker/dataprovider/FastPairTestDataCache.kt b/nearby/tests/multidevices/clients/src/android/nearby/multidevices/fastpair/seeker/dataprovider/FastPairTestDataCache.kt
index ad2b40d..481f407 100644
--- a/nearby/tests/multidevices/clients/src/android/nearby/multidevices/fastpair/seeker/dataprovider/FastPairTestDataCache.kt
+++ b/nearby/tests/multidevices/clients/src/android/nearby/multidevices/fastpair/seeker/dataprovider/FastPairTestDataCache.kt
@@ -17,7 +17,7 @@
package android.nearby.multidevices.fastpair.seeker.dataprovider
import android.nearby.FastPairAccountKeyDeviceMetadata
-import android.nearby.FastPairAntispoofkeyDeviceMetadata
+import android.nearby.FastPairAntispoofKeyDeviceMetadata
import android.nearby.FastPairDeviceMetadata
import android.nearby.FastPairDiscoveryItem
import com.google.common.io.BaseEncoding
@@ -28,8 +28,8 @@
object FastPairTestDataCache {
private val gson = Gson()
val accountKeyDeviceMetadata = mutableListOf<FastPairAccountKeyDeviceMetadata>()
- val antiSpoofKeyDeviceMetadataMap =
- mutableMapOf<String, FastPairAntispoofkeyDeviceMetadata>()
+ val antispoofKeyDeviceMetadataMap =
+ mutableMapOf<String, FastPairAntispoofKeyDeviceMetadata>()
fun putAccountKeyDeviceMetadata(json: String) {
accountKeyDeviceMetadata +=
@@ -40,15 +40,15 @@
fun dumpAccountKeyDeviceMetadata(): String =
gson.toJson(accountKeyDeviceMetadata.map { FastPairAccountKeyDeviceMetadataData(it) })
- fun putAntiSpoofKeyDeviceMetadata(modelId: String, json: String) {
- antiSpoofKeyDeviceMetadataMap[modelId] =
- gson.fromJson(json, FastPairAntiSpoofKeyDeviceMetadataData::class.java)
- .toFastPairAntispoofkeyDeviceMetadata()
+ fun putAntispoofKeyDeviceMetadata(modelId: String, json: String) {
+ antispoofKeyDeviceMetadataMap[modelId] =
+ gson.fromJson(json, FastPairAntispoofKeyDeviceMetadataData::class.java)
+ .toFastPairAntispoofKeyDeviceMetadata()
}
fun reset() {
accountKeyDeviceMetadata.clear()
- antiSpoofKeyDeviceMetadataMap.clear()
+ antispoofKeyDeviceMetadataMap.clear()
}
data class FastPairAccountKeyDeviceMetadataData(
@@ -74,12 +74,12 @@
}
}
- data class FastPairAntiSpoofKeyDeviceMetadataData(
+ data class FastPairAntispoofKeyDeviceMetadataData(
@SerializedName("anti_spoofing_public_key_str") val antiSpoofPublicKey: String?,
@SerializedName("fast_pair_device_metadata") val deviceMeta: FastPairDeviceMetadataData?,
) {
- fun toFastPairAntispoofkeyDeviceMetadata(): FastPairAntispoofkeyDeviceMetadata {
- return FastPairAntispoofkeyDeviceMetadata.Builder()
+ fun toFastPairAntispoofKeyDeviceMetadata(): FastPairAntispoofKeyDeviceMetadata {
+ return FastPairAntispoofKeyDeviceMetadata.Builder()
.setAntiSpoofPublicKey(antiSpoofPublicKey?.base64Decode())
.setFastPairDeviceMetadata(deviceMeta?.toFastPairDeviceMetadata())
.build()
diff --git a/nearby/tests/multidevices/clients/src/android/nearby/multidevices/fastpair/seeker/dataprovider/FastPairTestDataProvider.kt b/nearby/tests/multidevices/clients/src/android/nearby/multidevices/fastpair/seeker/dataprovider/FastPairTestDataProvider.kt
index 9ff513a..3bfd73e 100644
--- a/nearby/tests/multidevices/clients/src/android/nearby/multidevices/fastpair/seeker/dataprovider/FastPairTestDataProvider.kt
+++ b/nearby/tests/multidevices/clients/src/android/nearby/multidevices/fastpair/seeker/dataprovider/FastPairTestDataProvider.kt
@@ -23,17 +23,17 @@
class FastPairTestDataProvider : FastPairDataProviderBase(TAG) {
- override fun onLoadFastPairAntispoofkeyDeviceMetadata(
- request: FastPairAntispoofkeyDeviceMetadataRequest,
- callback: FastPairAntispoofkeyDeviceMetadataCallback
+ override fun onLoadFastPairAntispoofKeyDeviceMetadata(
+ request: FastPairAntispoofKeyDeviceMetadataRequest,
+ callback: FastPairAntispoofKeyDeviceMetadataCallback
) {
val requestedModelId = request.modelId.bytesToStringLowerCase()
- Log.d(TAG, "onLoadFastPairAntispoofkeyDeviceMetadata(modelId: $requestedModelId)")
+ Log.d(TAG, "onLoadFastPairAntispoofKeyDeviceMetadata(modelId: $requestedModelId)")
- val fastPairAntiSpoofKeyDeviceMetadata =
- FastPairTestDataCache.antiSpoofKeyDeviceMetadataMap[requestedModelId]
- if (fastPairAntiSpoofKeyDeviceMetadata != null) {
- callback.onFastPairAntispoofkeyDeviceMetadataReceived(fastPairAntiSpoofKeyDeviceMetadata)
+ val fastPairAntispoofKeyDeviceMetadata =
+ FastPairTestDataCache.antispoofKeyDeviceMetadataMap[requestedModelId]
+ if (fastPairAntispoofKeyDeviceMetadata != null) {
+ callback.onFastPairAntispoofKeyDeviceMetadataReceived(fastPairAntispoofKeyDeviceMetadata)
} else {
callback.onError(ERROR_CODE_BAD_REQUEST, "No metadata available for $requestedModelId")
}
@@ -44,7 +44,11 @@
callback: FastPairAccountDevicesMetadataCallback
) {
val requestedAccount = request.account
- Log.d(TAG, "onLoadFastPairAccountDevicesMetadata(account: $requestedAccount)")
+ val requestedAccountKeys = request.accountKeys
+ Log.d(
+ TAG, "onLoadFastPairAccountDevicesMetadata(" +
+ "account: $requestedAccount, accountKeys:$requestedAccountKeys)"
+ )
Log.d(TAG, FastPairTestDataCache.dumpAccountKeyDeviceMetadata())
callback.onFastPairAccountDevicesMetadataReceived(
diff --git a/nearby/tests/unit/src/com/android/server/nearby/NearbyServiceTest.java b/nearby/tests/unit/src/com/android/server/nearby/NearbyServiceTest.java
index c20cf22..faa3016 100644
--- a/nearby/tests/unit/src/com/android/server/nearby/NearbyServiceTest.java
+++ b/nearby/tests/unit/src/com/android/server/nearby/NearbyServiceTest.java
@@ -16,8 +16,11 @@
package com.android.server.nearby;
+import static android.Manifest.permission.READ_DEVICE_CONFIG;
+
import static org.mockito.MockitoAnnotations.initMocks;
+import android.app.UiAutomation;
import android.content.Context;
import android.nearby.IScanListener;
import android.nearby.ScanRequest;
@@ -33,13 +36,16 @@
private Context mContext;
private NearbyService mService;
private ScanRequest mScanRequest;
+ private UiAutomation mUiAutomation =
+ InstrumentationRegistry.getInstrumentation().getUiAutomation();
+
@Mock
private IScanListener mScanListener;
@Before
public void setup() {
initMocks(this);
-
+ mUiAutomation.adoptShellPermissionIdentity(READ_DEVICE_CONFIG);
mContext = InstrumentationRegistry.getInstrumentation().getContext();
mService = new NearbyService(mContext);
mScanRequest = createScanRequest();
diff --git a/nearby/tests/unit/src/com/android/server/nearby/presence/FastAdvertisementTest.java b/nearby/tests/unit/src/com/android/server/nearby/presence/FastAdvertisementTest.java
new file mode 100644
index 0000000..73d7695
--- /dev/null
+++ b/nearby/tests/unit/src/com/android/server/nearby/presence/FastAdvertisementTest.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2022 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 com.android.server.nearby.presence;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.nearby.BroadcastRequest;
+import android.nearby.PresenceBroadcastRequest;
+import android.nearby.PresenceCredential;
+import android.nearby.PrivateCredential;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Collections;
+
+/**
+ * Unit test for {@link FastAdvertisement}.
+ */
+public class FastAdvertisementTest {
+
+ private static final int IDENTITY_TYPE = PresenceCredential.IDENTITY_TYPE_PRIVATE;
+ private static final byte[] IDENTITY = new byte[]{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
+ private static final int MEDIUM_TYPE_BLE = 0;
+ private static final byte[] SALT = {2, 3};
+ private static final byte TX_POWER = 4;
+ private static final int PRESENCE_ACTION = 123;
+ private static final byte[] SECRET_ID = new byte[]{1, 2, 3, 4};
+ private static final byte[] AUTHENTICITY_KEY = new byte[]{12, 13, 14};
+ private static final byte[] EXPECTED_ADV_BYTES =
+ new byte[]{2, 2, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 123};
+
+ private PresenceBroadcastRequest.Builder mBuilder;
+ private PrivateCredential mCredential;
+
+ @Before
+ public void setUp() {
+ mCredential =
+ new PrivateCredential.Builder(SECRET_ID, AUTHENTICITY_KEY)
+ .setIdentityType(PresenceCredential.IDENTITY_TYPE_PRIVATE)
+ .setMetadataEncryptionKey(IDENTITY)
+ .build();
+ mBuilder =
+ new PresenceBroadcastRequest.Builder(Collections.singletonList(MEDIUM_TYPE_BLE),
+ SALT, mCredential)
+ .setTxPower(TX_POWER)
+ .setVersion(BroadcastRequest.PRESENCE_VERSION_V0)
+ .addAction(PRESENCE_ACTION);
+ }
+
+ @Test
+ public void testFastAdvertisementCreateFromRequest() {
+ FastAdvertisement originalAdvertisement = FastAdvertisement.createFromRequest(
+ mBuilder.build());
+
+ assertThat(originalAdvertisement.getActions()).containsExactly(PRESENCE_ACTION);
+ assertThat(originalAdvertisement.getIdentity()).isEqualTo(IDENTITY);
+ assertThat(originalAdvertisement.getIdentityType()).isEqualTo(IDENTITY_TYPE);
+ assertThat(originalAdvertisement.getLtvFieldCount()).isEqualTo(4);
+ assertThat(originalAdvertisement.getLength()).isEqualTo(19);
+ assertThat(originalAdvertisement.getVersion()).isEqualTo(
+ BroadcastRequest.PRESENCE_VERSION_V0);
+ assertThat(originalAdvertisement.getSalt()).isEqualTo(SALT);
+ }
+
+ @Test
+ public void testFastAdvertisementSerialization() {
+ FastAdvertisement originalAdvertisement = FastAdvertisement.createFromRequest(
+ mBuilder.build());
+ byte[] bytes = originalAdvertisement.toBytes();
+
+ assertThat(bytes).hasLength(originalAdvertisement.getLength());
+ assertThat(bytes).isEqualTo(EXPECTED_ADV_BYTES);
+ }
+}
diff --git a/nearby/tests/unit/src/com/android/server/nearby/provider/BleBroadcastProviderTest.java b/nearby/tests/unit/src/com/android/server/nearby/provider/BleBroadcastProviderTest.java
new file mode 100644
index 0000000..3467407
--- /dev/null
+++ b/nearby/tests/unit/src/com/android/server/nearby/provider/BleBroadcastProviderTest.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2022 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 com.android.server.nearby.provider;
+
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothManager;
+import android.bluetooth.le.AdvertiseSettings;
+import android.content.Context;
+import android.nearby.BroadcastCallback;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.server.nearby.injector.ContextHubManagerAdapter;
+import com.android.server.nearby.injector.Injector;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
+
+/**
+ * Unit test for {@link BleBroadcastProvider}.
+ */
+public class BleBroadcastProviderTest {
+ @Rule
+ public final MockitoRule mocks = MockitoJUnit.rule();
+
+ @Mock
+ private BleBroadcastProvider.BroadcastListener mBroadcastListener;
+ private BleBroadcastProvider mBleBroadcastProvider;
+
+ @Before
+ public void setUp() {
+ mBleBroadcastProvider = new BleBroadcastProvider(new TestInjector());
+ }
+
+ @Test
+ public void testOnStatus_success() {
+ byte[] advertiseBytes = new byte[]{1, 2, 3, 4};
+ mBleBroadcastProvider.start(advertiseBytes, mBroadcastListener);
+ verify(mBroadcastListener).onStatusChanged(eq(BroadcastCallback.STATUS_FAILURE));
+
+ AdvertiseSettings settings = new AdvertiseSettings.Builder().build();
+ mBleBroadcastProvider.onStartSuccess(settings);
+ verify(mBroadcastListener).onStatusChanged(eq(BroadcastCallback.STATUS_OK));
+ }
+
+ @Test
+ public void testOnStatus_failure() {
+ byte[] advertiseBytes = new byte[]{1, 2, 3, 4};
+ mBleBroadcastProvider.start(advertiseBytes, mBroadcastListener);
+
+ mBleBroadcastProvider.onStartFailure(BroadcastCallback.STATUS_FAILURE);
+ verify(mBroadcastListener, times(2)).onStatusChanged(eq(BroadcastCallback.STATUS_FAILURE));
+ }
+
+ private static class TestInjector implements Injector {
+
+ @Override
+ public BluetoothAdapter getBluetoothAdapter() {
+ Context context = ApplicationProvider.getApplicationContext();
+ BluetoothManager bluetoothManager = context.getSystemService(BluetoothManager.class);
+ return bluetoothManager.getAdapter();
+ }
+
+ @Override
+ public ContextHubManagerAdapter getContextHubManagerAdapter() {
+ return null;
+ }
+ }
+}
diff --git a/nearby/tests/unit/src/com/android/server/nearby/provider/BroadcastProviderManagerTest.java b/nearby/tests/unit/src/com/android/server/nearby/provider/BroadcastProviderManagerTest.java
new file mode 100644
index 0000000..71ece63
--- /dev/null
+++ b/nearby/tests/unit/src/com/android/server/nearby/provider/BroadcastProviderManagerTest.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright (C) 2022 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 com.android.server.nearby.provider;
+
+import static android.Manifest.permission.READ_DEVICE_CONFIG;
+import static android.Manifest.permission.WRITE_DEVICE_CONFIG;
+import static android.provider.DeviceConfig.NAMESPACE_TETHERING;
+
+import static com.android.server.nearby.NearbyConfiguration.NEARBY_ENABLE_PRESENCE_BROADCAST_LEGACY;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.verify;
+
+import android.app.UiAutomation;
+import android.content.Context;
+import android.nearby.BroadcastCallback;
+import android.nearby.BroadcastRequest;
+import android.nearby.IBroadcastListener;
+import android.nearby.PresenceBroadcastRequest;
+import android.nearby.PresenceCredential;
+import android.nearby.PrivateCredential;
+import android.provider.DeviceConfig;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import com.google.common.util.concurrent.MoreExecutors;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
+
+import java.util.Collections;
+
+/**
+ * Unit test for {@link BroadcastProviderManager}.
+ */
+public class BroadcastProviderManagerTest {
+ private static final byte[] IDENTITY = new byte[]{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
+ private static final int MEDIUM_TYPE_BLE = 0;
+ private static final byte[] SALT = {2, 3};
+ private static final byte TX_POWER = 4;
+ private static final int PRESENCE_ACTION = 123;
+ private static final byte[] SECRET_ID = new byte[]{1, 2, 3, 4};
+ private static final byte[] AUTHENTICITY_KEY = new byte[]{12, 13, 14};
+
+ @Rule
+ public final MockitoRule mocks = MockitoJUnit.rule();
+
+ @Mock
+ IBroadcastListener mBroadcastListener;
+ @Mock
+ BleBroadcastProvider mBleBroadcastProvider;
+ private Context mContext;
+ private BroadcastProviderManager mBroadcastProviderManager;
+ private BroadcastRequest mBroadcastRequest;
+ private UiAutomation mUiAutomation =
+ InstrumentationRegistry.getInstrumentation().getUiAutomation();
+
+ @Before
+ public void setUp() {
+ mUiAutomation.adoptShellPermissionIdentity(WRITE_DEVICE_CONFIG, READ_DEVICE_CONFIG);
+ DeviceConfig.setProperty(NAMESPACE_TETHERING, NEARBY_ENABLE_PRESENCE_BROADCAST_LEGACY,
+ "true", false);
+
+ mContext = ApplicationProvider.getApplicationContext();
+ mBroadcastProviderManager = new BroadcastProviderManager(MoreExecutors.directExecutor(),
+ mBleBroadcastProvider);
+
+ PrivateCredential privateCredential =
+ new PrivateCredential.Builder(SECRET_ID, AUTHENTICITY_KEY)
+ .setIdentityType(PresenceCredential.IDENTITY_TYPE_PRIVATE)
+ .setMetadataEncryptionKey(IDENTITY)
+ .build();
+ mBroadcastRequest =
+ new PresenceBroadcastRequest.Builder(Collections.singletonList(MEDIUM_TYPE_BLE),
+ SALT, privateCredential)
+ .setTxPower(TX_POWER)
+ .setVersion(BroadcastRequest.PRESENCE_VERSION_V0)
+ .addAction(PRESENCE_ACTION).build();
+ }
+
+ @Test
+ public void testStartAdvertising() {
+ mBroadcastProviderManager.startBroadcast(mBroadcastRequest, mBroadcastListener);
+ verify(mBleBroadcastProvider).start(any(byte[].class), any(
+ BleBroadcastProvider.BroadcastListener.class));
+ }
+
+ @Test
+ public void testStartAdvertising_featureDisabled() throws Exception {
+ DeviceConfig.setProperty(NAMESPACE_TETHERING, NEARBY_ENABLE_PRESENCE_BROADCAST_LEGACY,
+ "false", false);
+ mBroadcastProviderManager = new BroadcastProviderManager(MoreExecutors.directExecutor(),
+ mBleBroadcastProvider);
+ mBroadcastProviderManager.startBroadcast(mBroadcastRequest, mBroadcastListener);
+ verify(mBroadcastListener).onStatusChanged(eq(BroadcastCallback.STATUS_FAILURE));
+ }
+
+ @Test
+ public void testOnStatusChanged() throws Exception {
+ mBroadcastProviderManager.startBroadcast(mBroadcastRequest, mBroadcastListener);
+ mBroadcastProviderManager.onStatusChanged(BroadcastCallback.STATUS_OK);
+ verify(mBroadcastListener).onStatusChanged(eq(BroadcastCallback.STATUS_OK));
+ }
+}
diff --git a/nearby/tests/unit/src/com/android/server/nearby/provider/UtilsTest.java b/nearby/tests/unit/src/com/android/server/nearby/provider/UtilsTest.java
index 08a3c7c..6d04f2b 100644
--- a/nearby/tests/unit/src/com/android/server/nearby/provider/UtilsTest.java
+++ b/nearby/tests/unit/src/com/android/server/nearby/provider/UtilsTest.java
@@ -20,7 +20,7 @@
import android.accounts.Account;
import android.nearby.aidl.FastPairAccountKeyDeviceMetadataParcel;
-import android.nearby.aidl.FastPairAntispoofkeyDeviceMetadataParcel;
+import android.nearby.aidl.FastPairAntispoofKeyDeviceMetadataParcel;
import android.nearby.aidl.FastPairDeviceMetadataParcel;
import android.nearby.aidl.FastPairDiscoveryItemParcel;
import android.nearby.aidl.FastPairEligibleAccountParcel;
@@ -240,7 +240,7 @@
public void testHappyPathConvertToGetObservedDeviceResponse() {
Rpcs.GetObservedDeviceResponse response =
Utils.convertToGetObservedDeviceResponse(
- genHappyPathFastPairAntispoofkeyDeviceMetadataParcel());
+ genHappyPathFastPairAntispoofKeyDeviceMetadataParcel());
assertThat(response).isEqualTo(genHappyPathObservedDeviceResponse());
}
@@ -255,14 +255,14 @@
@SdkSuppress(minSdkVersion = 32, codeName = "T")
public void testConvertToGetObservedDeviceResponseWithEmptyInputNotCrash() {
Utils.convertToGetObservedDeviceResponse(
- genEmptyFastPairAntispoofkeyDeviceMetadataParcel());
+ genEmptyFastPairAntispoofKeyDeviceMetadataParcel());
}
@Test
@SdkSuppress(minSdkVersion = 32, codeName = "T")
public void testConvertToGetObservedDeviceResponseWithEmptyDeviceMetadataNotCrash() {
Utils.convertToGetObservedDeviceResponse(
- genFastPairAntispoofkeyDeviceMetadataParcelWithEmptyDeviceMetadata());
+ genFastPairAntispoofKeyDeviceMetadataParcelWithEmptyDeviceMetadata());
}
@Test
@@ -706,28 +706,28 @@
.build();
}
- private static FastPairAntispoofkeyDeviceMetadataParcel
- genHappyPathFastPairAntispoofkeyDeviceMetadataParcel() {
- FastPairAntispoofkeyDeviceMetadataParcel parcel =
- new FastPairAntispoofkeyDeviceMetadataParcel();
+ private static FastPairAntispoofKeyDeviceMetadataParcel
+ genHappyPathFastPairAntispoofKeyDeviceMetadataParcel() {
+ FastPairAntispoofKeyDeviceMetadataParcel parcel =
+ new FastPairAntispoofKeyDeviceMetadataParcel();
parcel.antiSpoofPublicKey = ANTI_SPOOFING_KEY;
parcel.deviceMetadata = genHappyPathFastPairDeviceMetadataParcel();
return parcel;
}
- private static FastPairAntispoofkeyDeviceMetadataParcel
- genFastPairAntispoofkeyDeviceMetadataParcelWithEmptyDeviceMetadata() {
- FastPairAntispoofkeyDeviceMetadataParcel parcel =
- new FastPairAntispoofkeyDeviceMetadataParcel();
+ private static FastPairAntispoofKeyDeviceMetadataParcel
+ genFastPairAntispoofKeyDeviceMetadataParcelWithEmptyDeviceMetadata() {
+ FastPairAntispoofKeyDeviceMetadataParcel parcel =
+ new FastPairAntispoofKeyDeviceMetadataParcel();
parcel.antiSpoofPublicKey = ANTI_SPOOFING_KEY;
parcel.deviceMetadata = genEmptyFastPairDeviceMetadataParcel();
return parcel;
}
- private static FastPairAntispoofkeyDeviceMetadataParcel
- genEmptyFastPairAntispoofkeyDeviceMetadataParcel() {
- return new FastPairAntispoofkeyDeviceMetadataParcel();
+ private static FastPairAntispoofKeyDeviceMetadataParcel
+ genEmptyFastPairAntispoofKeyDeviceMetadataParcel() {
+ return new FastPairAntispoofKeyDeviceMetadataParcel();
}
}