| commit | 4a853e342dd81751d6f7636bf5a03192584e5954 | [log] [tgz] |
|---|---|---|
| author | Yahav Nussbaum <yahav@google.com> | Tue Mar 05 19:39:03 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 05 19:39:03 2024 +0000 |
| tree | 6db0f486c9a7ae43dbcb72a6e536f095a18dcdee | |
| parent | abdaaebf47b6f3b0b7221030cb8da5e0913e17a7 [diff] | |
| parent | 11639be0e602ca09236d8f74929b19f9918a9a96 [diff] |
Merge "Test BluetoothFinderManager for SDK at least V" into main am: 11639be0e6 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2985693 Change-Id: I33ae96cf5843e9d543145709156c877e74e6789a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/nearby/tests/unit/src/com/android/server/nearby/managers/BluetoothFinderManagerTest.java b/nearby/tests/unit/src/com/android/server/nearby/managers/BluetoothFinderManagerTest.java index 671b5c5..32286e1 100644 --- a/nearby/tests/unit/src/com/android/server/nearby/managers/BluetoothFinderManagerTest.java +++ b/nearby/tests/unit/src/com/android/server/nearby/managers/BluetoothFinderManagerTest.java
@@ -18,6 +18,7 @@ import static com.google.common.truth.Truth.assertThat; +import static org.junit.Assume.assumeTrue; import static org.mockito.Mockito.any; import static org.mockito.Mockito.anyBoolean; import static org.mockito.Mockito.anyInt; @@ -33,6 +34,8 @@ import android.os.RemoteException; import android.os.ServiceSpecificException; +import com.android.modules.utils.build.SdkLevel; + import org.junit.Before; import org.junit.Test; import org.mockito.ArgumentCaptor; @@ -68,6 +71,8 @@ @Before public void setup() { + // Replace with minSdkVersion when Build.VERSION_CODES.VANILLA_ICE_CREAM can be used. + assumeTrue(SdkLevel.isAtLeastV()); MockitoAnnotations.initMocks(this); mBluetoothFinderManager = new BluetoothFinderManagerSpy(); }