diff options
| author | 2022-07-08 02:02:18 +0000 | |
|---|---|---|
| committer | 2022-07-08 02:02:18 +0000 | |
| commit | cfb992e4adfbf2fc419f06924631d05006339516 (patch) | |
| tree | 3a693822868179ddf65d46a2826b7b37c07fda1e | |
| parent | 85199de9d6ad6fd196bcef0fcd12a15397800e01 (diff) | |
| parent | 32492d576a8aa389b11d9e776ab68aac8bc996c4 (diff) | |
Merge "USB: Add NCM functions to related tests"
| -rw-r--r-- | tests/UsbManagerTests/lib/src/com/android/server/usblib/UsbManagerTestLib.java | 2 | ||||
| -rw-r--r-- | tests/UsbTests/src/com/android/server/usb/UsbHandlerTest.java | 8 |
2 files changed, 10 insertions, 0 deletions
diff --git a/tests/UsbManagerTests/lib/src/com/android/server/usblib/UsbManagerTestLib.java b/tests/UsbManagerTests/lib/src/com/android/server/usblib/UsbManagerTestLib.java index 782439f80fc8..d133f6fbdd87 100644 --- a/tests/UsbManagerTests/lib/src/com/android/server/usblib/UsbManagerTestLib.java +++ b/tests/UsbManagerTests/lib/src/com/android/server/usblib/UsbManagerTestLib.java @@ -117,6 +117,7 @@ public class UsbManagerTestLib { testGetCurrentFunctionsMock_Matched(UsbManager.FUNCTION_PTP); testGetCurrentFunctionsMock_Matched(UsbManager.FUNCTION_MIDI); testGetCurrentFunctionsMock_Matched(UsbManager.FUNCTION_RNDIS); + testGetCurrentFunctionsMock_Matched(UsbManager.FUNCTION_NCM); } public void testSetCurrentFunctions_shouldMatched() { @@ -125,5 +126,6 @@ public class UsbManagerTestLib { testSetCurrentFunctionsMock_Matched(UsbManager.FUNCTION_PTP); testSetCurrentFunctionsMock_Matched(UsbManager.FUNCTION_MIDI); testSetCurrentFunctionsMock_Matched(UsbManager.FUNCTION_RNDIS); + testSetCurrentFunctionsMock_Matched(UsbManager.FUNCTION_NCM); } } diff --git a/tests/UsbTests/src/com/android/server/usb/UsbHandlerTest.java b/tests/UsbTests/src/com/android/server/usb/UsbHandlerTest.java index 861d221238ff..86bcb7290d95 100644 --- a/tests/UsbTests/src/com/android/server/usb/UsbHandlerTest.java +++ b/tests/UsbTests/src/com/android/server/usb/UsbHandlerTest.java @@ -182,6 +182,14 @@ public class UsbHandlerTest { @SmallTest @Test + public void setFunctionsNcm() { + mUsbHandler.handleMessage(mUsbHandler.obtainMessage(MSG_SET_CURRENT_FUNCTIONS, + UsbManager.FUNCTION_NCM)); + assertNotEquals(mUsbHandler.getEnabledFunctions() & UsbManager.FUNCTION_NCM, 0); + } + + @SmallTest + @Test public void setFunctionsNcmAndRndis() { final long rndisPlusNcm = UsbManager.FUNCTION_RNDIS | UsbManager.FUNCTION_NCM; |