Merge "Address API council review comments." into tm-dev
diff --git a/nearby/framework/java/android/nearby/NearbyDeviceParcelable.java b/nearby/framework/java/android/nearby/NearbyDeviceParcelable.java
index e9a29b7..f137de4 100644
--- a/nearby/framework/java/android/nearby/NearbyDeviceParcelable.java
+++ b/nearby/framework/java/android/nearby/NearbyDeviceParcelable.java
@@ -19,7 +19,6 @@
import android.annotation.IntRange;
import android.annotation.NonNull;
import android.annotation.Nullable;
-import android.annotation.SystemApi;
import android.bluetooth.le.ScanRecord;
import android.os.Parcel;
import android.os.Parcelable;
@@ -39,7 +38,6 @@
*
* @hide
*/
-@SystemApi
public final class NearbyDeviceParcelable implements Parcelable {
/**
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 af49da1..b175234 100644
--- a/nearby/service/java/com/android/server/nearby/fastpair/FastPairAdvHandler.java
+++ b/nearby/service/java/com/android/server/nearby/fastpair/FastPairAdvHandler.java
@@ -179,6 +179,9 @@
List<Data.FastPairDeviceWithAccountKey> devices, BloomFilter bloomFilter, byte[] salt) {
Log.d(TAG, "saved devices size in the account is " + devices.size());
for (Data.FastPairDeviceWithAccountKey device : devices) {
+ if (device.getAccountKey().toByteArray() == null || salt == null) {
+ return null;
+ }
byte[] rotatedKey = concat(device.getAccountKey().toByteArray(), salt);
StringBuilder sb = new StringBuilder();
for (byte b : rotatedKey) {
@@ -198,6 +201,9 @@
static Cache.StoredFastPairItem findRecognizedDeviceFromCachedItem(
List<Cache.StoredFastPairItem> devices, BloomFilter bloomFilter, byte[] salt) {
for (Cache.StoredFastPairItem device : devices) {
+ if (device.getAccountKey().toByteArray() == null || salt == null) {
+ return null;
+ }
byte[] rotatedKey = concat(device.getAccountKey().toByteArray(), salt);
if (bloomFilter.possiblyContains(rotatedKey)) {
return device;