diff options
| author | Glen Kuhne <kuh@google.com> | 2017-08-02 11:02:50 -0700 |
|---|---|---|
| committer | Glen Kuhne <kuh@google.com> | 2017-08-02 14:18:16 -0700 |
| commit | 5bf1c66cfc5099801abe53fd54cef661740b24b5 (patch) | |
| tree | a963c0a4ce17ee7f7eb6714eaab9a5387e5727cc /tests | |
| parent | b1d6ef28f4a40b4b7384859b52b176d55f7d4bae (diff) | |
Restore WifiP2pDevice.primaryDeviceType formatting
This CL restores the formatting of the primaryDeviceType string in
WifiP2pDevice, which was broken when the HAL moved to Treble instead of
wpa_supplicant ctrl-iface (which was applying the appropriate
formatter).
Bug: 63657840
Test: Manually verified, & unit tests updated
Change-Id: Ia86d74801020bf9098a3b7721e464201f99047f5
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/wifitests/src/com/android/server/wifi/p2p/SupplicantP2pIfaceCallbackTest.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/wifitests/src/com/android/server/wifi/p2p/SupplicantP2pIfaceCallbackTest.java b/tests/wifitests/src/com/android/server/wifi/p2p/SupplicantP2pIfaceCallbackTest.java index 4443bb1f6..8b853a470 100644 --- a/tests/wifitests/src/com/android/server/wifi/p2p/SupplicantP2pIfaceCallbackTest.java +++ b/tests/wifitests/src/com/android/server/wifi/p2p/SupplicantP2pIfaceCallbackTest.java @@ -83,8 +83,8 @@ public class SupplicantP2pIfaceCallbackTest { */ @Test public void testOnDeviceFound_success() throws Exception { - byte[] fakePrimaryDeviceTypeBytes = { 0x01, 0x02, 0x03 }; - String fakePrimaryDeviceTypeString = "010203"; + byte[] fakePrimaryDeviceTypeBytes = { 0x00, 0x01, 0x02, -1, 0x04, 0x05, 0x06, 0x07 }; + String fakePrimaryDeviceTypeString = "1-02FF0405-1543"; String fakeDeviceName = "test device name"; short fakeConfigMethods = 0x1234; byte fakeCapabilities = 123; @@ -131,8 +131,8 @@ public class SupplicantP2pIfaceCallbackTest { */ @Test public void testOnDeviceFound_invalidArguments() throws Exception { - byte[] fakePrimaryDeviceTypeBytes = { 0x01, 0x02, 0x03 }; - String fakePrimaryDeviceTypeString = "010203"; + byte[] fakePrimaryDeviceTypeBytes = { 0x0, 0x01, 0x02, -1, 0x04, 0x05, 0x06, 0x07 }; + String fakePrimaryDeviceTypeString = "1-02FF0405-1543"; String fakeDeviceName = "test device name"; short fakeConfigMethods = 0x1234; byte fakeCapabilities = 123; |