Fix scanner bugs
1. Change wrong Precondition check in ScanListenerTransport
2. Move FastPairManger initiator to onBootPhase()
3. nit: Remove extra empty line
Test: Build and verified NearbyManger log
Change-Id: I6bb7d98ad49e3246054976e634e65ec428de36e5
diff --git a/nearby/framework/java/android/nearby/NearbyManager.java b/nearby/framework/java/android/nearby/NearbyManager.java
index 4b69e4f..20f9164 100644
--- a/nearby/framework/java/android/nearby/NearbyManager.java
+++ b/nearby/framework/java/android/nearby/NearbyManager.java
@@ -149,8 +149,8 @@
@CallbackExecutor Executor executor) {
Preconditions.checkArgument(scanCallback != null,
"invalid null callback");
- Preconditions.checkState(ScanRequest.isValidScanType(mScanType),
- "invalid scan type : " + mScanType
+ Preconditions.checkState(ScanRequest.isValidScanType(scanType),
+ "invalid scan type : " + scanType
+ ", scan type must be one of ScanRequest#SCAN_TYPE_");
mScanType = scanType;
mScanCallback = scanCallback;
diff --git a/nearby/service/java/com/android/server/nearby/NearbyService.java b/nearby/service/java/com/android/server/nearby/NearbyService.java
index 12eea8b..b851c72 100644
--- a/nearby/service/java/com/android/server/nearby/NearbyService.java
+++ b/nearby/service/java/com/android/server/nearby/NearbyService.java
@@ -52,7 +52,6 @@
Log.d(TAG, "Publishing NearbyService");
}
publishBinderService(Context.NEARBY_SERVICE, mImpl);
- mFastPairManager.initiate();
}
@Override
@@ -62,6 +61,7 @@
} else if (phase == PHASE_BOOT_COMPLETED) {
// the nearby service must be functioning after this boot phase.
mImpl.onSystemReady();
+ mFastPairManager.initiate();
}
}
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 0457f4f..d6625a4 100644
--- a/nearby/service/java/com/android/server/nearby/fastpair/FastPairManager.java
+++ b/nearby/service/java/com/android/server/nearby/fastpair/FastPairManager.java
@@ -16,7 +16,6 @@
package com.android.server.nearby.fastpair;
-
import static com.android.server.nearby.fastpair.Constant.DEVICE_PAIRING_FRAGMENT_TYPE;
import static com.android.server.nearby.fastpair.Constant.EXTRA_BINDER;
import static com.android.server.nearby.fastpair.Constant.EXTRA_BUNDLE;