[conflict] Merge "[CTS] Fix CTS failure in mainline train" into android13-tests-dev am: 2d3df1b225 am: b1391d5d15 am: f460f6143b am: aabdbafcfe am: 311de7301c am: 296247904a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2222423
Change-Id: Ic9b6191509cadf0ca15a7075a0f0d675e2f0c6a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Ignore-AOSP-First: resolve merge conflict from AOSP
Fix: 248151186
diff --git a/nearby/tests/cts/fastpair/src/android/nearby/cts/NearbyDeviceParcelableTest.java b/nearby/tests/cts/fastpair/src/android/nearby/cts/NearbyDeviceParcelableTest.java
index 0487aa4..2907e56 100644
--- a/nearby/tests/cts/fastpair/src/android/nearby/cts/NearbyDeviceParcelableTest.java
+++ b/nearby/tests/cts/fastpair/src/android/nearby/cts/NearbyDeviceParcelableTest.java
@@ -63,32 +63,6 @@
.setData(SCAN_DATA);
}
- /** Verify toString returns expected string. */
- @Test
- @SdkSuppress(minSdkVersion = 33, codeName = "T")
- public void testToString() {
- PublicCredential publicCredential =
- new PublicCredential.Builder(
- new byte[] {1},
- new byte[] {2},
- new byte[] {3},
- new byte[] {4},
- new byte[] {5})
- .build();
- NearbyDeviceParcelable nearbyDeviceParcelable =
- mBuilder.setFastPairModelId(null)
- .setData(null)
- .setPublicCredential(publicCredential)
- .build();
-
- assertThat(nearbyDeviceParcelable.toString())
- .isEqualTo(
- "NearbyDeviceParcelable[scanType=2, name=testDevice, medium=BLE, "
- + "txPower=0, rssi=-60, action=0, bluetoothAddress="
- + BLUETOOTH_ADDRESS
- + ", fastPairModelId=null, data=null, salt=null]");
- }
-
@Test
@SdkSuppress(minSdkVersion = 33, codeName = "T")
public void testNullFields() {