Move load account info inside try block fix exception not catch
Test: unit test
Bug: 223118719
Ignore-AOSP-First: nearby_not_in_aosp_yet
Change-Id: Ie6803f6aadf5d72afd9c18656e43e9b1a7fe45f4
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 4de4cee..2ecce47 100644
--- a/nearby/service/java/com/android/server/nearby/fastpair/FastPairAdvHandler.java
+++ b/nearby/service/java/com/android/server/nearby/fastpair/FastPairAdvHandler.java
@@ -91,12 +91,13 @@
if (mPairDataProvider == null) {
return;
}
- List<Account> accountList = mPairDataProvider.loadFastPairEligibleAccounts();
+
if (FastPairDecoder.checkModelId(fastPairDevice.getData())) {
byte[] model = FastPairDecoder.getModelId(fastPairDevice.getData());
Log.d(TAG, "On discovery model id " + Hex.bytesToStringLowercase(model));
// Use api to get anti spoofing key from model id.
try {
+ List<Account> accountList = mPairDataProvider.loadFastPairEligibleAccounts();
Rpcs.GetObservedDeviceResponse response =
mPairDataProvider.loadFastPairAntispoofKeyDeviceMetadata(model);
if (response == null) {
@@ -121,6 +122,7 @@
} else {
// Start to process bloom filter
try {
+ List<Account> accountList = mPairDataProvider.loadFastPairEligibleAccounts();
byte[] bloomFilterByteArray = FastPairDecoder
.getBloomFilter(fastPairDevice.getData());
byte[] bloomFilterSalt = FastPairDecoder