commit dbc8a104e0949f9c7510b61242d7fc1c4e5cc605
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jan 27 01:02:43 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 27 01:02:43 2022 +0000
tree 8220b157633fdeda3ce77728584fac05a8b169f4
parent 22b689d30badbcb4d082faceb1b84e2c7e81fd80
parent 56a30e13a878a3a3c87e0de4bd2bb074117c88cb

Merge "Make the FastPairDataProvider initiate logs more readable."

nearby/framework/Android.bp

diff --git a/nearby/framework/Android.bp b/nearby/framework/Android.bp
index 74980c9..fd7f2c9 100644
--- a/nearby/framework/Android.bp
+++ b/nearby/framework/Android.bp
@@ -59,7 +59,10 @@
     name: "framework-nearby-pre-jarjar",
     defaults: ["framework-nearby-defaults"],
     sdk_version: "module_current",
-    libs: ["framework-annotations-lib"],
+    libs: [
+        "framework-annotations-lib",
+        "framework-bluetooth",
+    ],
     // java_api_finder must accompany `srcs` (`srcs` defined in `framework-nearby-defaults`)
     plugins: ["java_api_finder"],
     installable: false,
@@ -77,6 +80,7 @@
         "framework-module-defaults",  // the SDK needs to be usable in all processes
         "framework-nearby-defaults",
     ],
+    libs: ["framework-bluetooth"],
 
     jarjar_rules: ":nearby-jarjar-rules",
     apex_available: [

nearby/halfsheet/Android.bp

diff --git a/nearby/halfsheet/Android.bp b/nearby/halfsheet/Android.bp
index 781f308..82d0933 100644
--- a/nearby/halfsheet/Android.bp
+++ b/nearby/halfsheet/Android.bp
@@ -26,6 +26,7 @@
     plugins: ["java_api_finder"],
     jarjar_rules: ":nearby-jarjar-rules",
     libs: [
+        "framework-bluetooth",
         "framework-nearby-pre-jarjar",
         "nearby-service-string",
       ],

nearby/service/Android.bp

diff --git a/nearby/service/Android.bp b/nearby/service/Android.bp
index b80d677..5b0028e 100644
--- a/nearby/service/Android.bp
+++ b/nearby/service/Android.bp
@@ -36,6 +36,7 @@
 java_library {
     name: "nearby-service-string",
     srcs: [":nearby-service-string-res"],
+    libs: ["framework-bluetooth"],
     sdk_version: "module_current",
 }
 
@@ -53,6 +54,7 @@
         // pre-jarjar symbols are needed so that nearby-service can reference the original class
         // names at compile time
         "framework-nearby-pre-jarjar",
+        "framework-bluetooth.stubs.module_lib", // TODO(b/215722418): Change to framework-bluetooth once fixed
         "error_prone_annotations",
     ],
     static_libs: [

nearby/service/java/com/android/server/nearby/fastpair/FastPairManager.java

diff --git a/nearby/service/java/com/android/server/nearby/fastpair/FastPairManager.java b/nearby/service/java/com/android/server/nearby/fastpair/FastPairManager.java
index b1fc0b4..41b6da7 100644
--- a/nearby/service/java/com/android/server/nearby/fastpair/FastPairManager.java
+++ b/nearby/service/java/com/android/server/nearby/fastpair/FastPairManager.java
@@ -29,7 +29,6 @@
 import android.nearby.NearbyDevice;
 import android.nearby.NearbyManager;
 import android.nearby.ScanCallback;
-import android.nearby.ScanRequest;
 import android.util.Log;
 
 import androidx.annotation.NonNull;
@@ -53,7 +52,6 @@
 import com.android.server.nearby.fastpair.pairinghandler.PairingProgressHandlerBase;
 import com.android.server.nearby.provider.FastPairDataProvider;
 import com.android.server.nearby.util.FastPairDecoder;
-import com.android.server.nearby.util.ForegroundThread;
 import com.android.server.nearby.util.Hex;
 
 import com.google.protobuf.ByteString;
@@ -102,11 +100,12 @@
                 Log.d("FastPairService", " the nearby manager is " + nearbyManager);
 
                 if (nearbyManager != null) {
-                    nearbyManager.startScan(
-                            new ScanRequest.Builder()
-                                    .setScanType(ScanRequest.SCAN_TYPE_FAST_PAIR).build(),
-                            ForegroundThread.getExecutor(),
-                            mScanCallback);
+                    // Uncomment this if you want to get mainline half sheet
+//                    nearbyManager.startScan(
+//                            new ScanRequest.Builder()
+//                                    .setScanType(ScanRequest.SCAN_TYPE_FAST_PAIR).build(),
+//                            ForegroundThread.getExecutor(),
+//                            mScanCallback);
                 } else {
                     Log.d("FastPairService", " the nearby manager is null");
                 }