commit 600d2337e1d767038843ff1da7f437afb783808e
author Xinyi Zhou <zxy@google.com> Wed Mar 30 15:11:35 2022 -0700
committer Eric Lin <ericth@google.com> Thu Mar 31 05:20:11 2022 +0000
tree 940b0da0c5de75b9c4bcc3900224770598abfeea
parent 6855a1524bfd71b48f57f4dac2a82e010b3bdfb0

Use Ble scan for Fast Pair

Fix: 227448841
Test: Built and verified logs
Test: Manual test with NearbyFastPairProviderSimulatorApp, the halfsheet popup, go/ml-fp-dp-tool
Ignore-AOSP-First: nearby_not_in_aosp_yet
Change-Id: Icb068323ff26542131ddd7af6ad2ce4fa33009e2

nearby/service/java/com/android/server/nearby/provider/DiscoveryProviderManager.java

diff --git a/nearby/service/java/com/android/server/nearby/provider/DiscoveryProviderManager.java b/nearby/service/java/com/android/server/nearby/provider/DiscoveryProviderManager.java
index 9003499..53d61c2 100644
--- a/nearby/service/java/com/android/server/nearby/provider/DiscoveryProviderManager.java
+++ b/nearby/service/java/com/android/server/nearby/provider/DiscoveryProviderManager.java
@@ -187,13 +187,13 @@
     // starts successfully.
     private boolean startProviders(ScanRequest scanRequest) {
         if (scanRequest.isBleEnabled()) {
-            if (mChreDiscoveryProvider.available()) {
+            if (mChreDiscoveryProvider.available()
+                    && scanRequest.getScanType() == SCAN_TYPE_NEARBY_PRESENCE) {
                 startChreProvider();
-                return true;
             } else {
                 startBleProvider(scanRequest);
-                return true;
             }
+            return true;
         }
         return false;
     }