diff options
| author | Wei Wang <weiwa@google.com> | 2014-07-25 15:14:55 -0700 |
|---|---|---|
| committer | Wei Wang <weiwa@google.com> | 2014-07-27 23:12:26 -0700 |
| commit | ab2ed62f15d0dac0f8ef825ff2d3677c9ae18f44 (patch) | |
| tree | 017c806c09540c337bb47bae3d915865183cb3c4 /core/tests | |
| parent | 56e079efc672bdc129a759630fd579f63d0eea02 (diff) | |
| download | frameworks_base-ab2ed62f15d0dac0f8ef825ff2d3677c9ae18f44.zip frameworks_base-ab2ed62f15d0dac0f8ef825ff2d3677c9ae18f44.tar.gz frameworks_base-ab2ed62f15d0dac0f8ef825ff2d3677c9ae18f44.tar.bz2 | |
Split manu id and manu data.
b/16407380
Change-Id: I39f6ce0ab4cccadec809f0a4f518f5d2c77a90b7
Diffstat (limited to 'core/tests')
| -rw-r--r-- | core/tests/bluetoothtests/src/android/bluetooth/le/ScanRecordTest.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/core/tests/bluetoothtests/src/android/bluetooth/le/ScanRecordTest.java b/core/tests/bluetoothtests/src/android/bluetooth/le/ScanRecordTest.java index e259bcc..ccdd90a 100644 --- a/core/tests/bluetoothtests/src/android/bluetooth/le/ScanRecordTest.java +++ b/core/tests/bluetoothtests/src/android/bluetooth/le/ScanRecordTest.java @@ -27,8 +27,7 @@ import java.util.Arrays; /** * Unit test cases for {@link ScanRecord}. * <p> - * To run this test, use adb shell am instrument -e class - * 'android.bluetooth.ScanRecordTest' -w + * To run this test, use adb shell am instrument -e class 'android.bluetooth.ScanRecordTest' -w * 'com.android.bluetooth.tests/android.bluetooth.BluetoothTestRunner' */ public class ScanRecordTest extends TestCase { @@ -54,13 +53,13 @@ public class ScanRecordTest extends TestCase { assertEquals("Ped", data.getDeviceName()); assertEquals(-20, data.getTxPowerLevel()); - assertEquals(224, data.getManufacturerId()); + assertEquals(0x00e0, data.getManufacturerId()); assertArrayEquals(new byte[] { - (byte) 0xe0, 0x00, 0x02, 0x15 }, data.getManufacturerSpecificData()); + 0x02, 0x15 }, data.getManufacturerSpecificData()); assertEquals(uuid2, data.getServiceDataUuid()); assertArrayEquals(new byte[] { - 0x0b, 0x11, 0x50, 0x64 }, data.getServiceData()); + 0x50, 0x64 }, data.getServiceData()); } // Assert two byte arrays are equal. |