From 65d8caa4055c6045f3c96d1e5f28467bdc9cba7f Mon Sep 17 00:00:00 2001 From: Lorenzo Colitti Date: Sun, 31 Jan 2021 23:32:13 +0900 Subject: [PATCH] Add UsbHandlerTest test for NCM and RNDIS at the same time. Follows up on review comment on https://r.android.com/1559090. Bug: 172793258 Test: new unit test passes Change-Id: I363db6f0a9c60be4eca3bcfeb888dd5c0fc4840a --- .../com/android/server/usb/UsbHandlerTest.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tests/UsbTests/src/com/android/server/usb/UsbHandlerTest.java b/tests/UsbTests/src/com/android/server/usb/UsbHandlerTest.java index ef973acf763b2..861d221238ff4 100644 --- a/tests/UsbTests/src/com/android/server/usb/UsbHandlerTest.java +++ b/tests/UsbTests/src/com/android/server/usb/UsbHandlerTest.java @@ -180,6 +180,24 @@ public class UsbHandlerTest { assertNotEquals(mUsbHandler.getEnabledFunctions() & UsbManager.FUNCTION_RNDIS, 0); } + @SmallTest + @Test + public void setFunctionsNcmAndRndis() { + final long rndisPlusNcm = UsbManager.FUNCTION_RNDIS | UsbManager.FUNCTION_NCM; + + mUsbHandler.handleMessage(mUsbHandler.obtainMessage(MSG_SET_CURRENT_FUNCTIONS, + UsbManager.FUNCTION_NCM)); + assertEquals(UsbManager.FUNCTION_NCM, mUsbHandler.getEnabledFunctions() & rndisPlusNcm); + + mUsbHandler.handleMessage(mUsbHandler.obtainMessage(MSG_SET_CURRENT_FUNCTIONS, + rndisPlusNcm)); + assertEquals(rndisPlusNcm, mUsbHandler.getEnabledFunctions() & rndisPlusNcm); + + mUsbHandler.handleMessage(mUsbHandler.obtainMessage(MSG_SET_CURRENT_FUNCTIONS, + UsbManager.FUNCTION_NCM)); + assertEquals(UsbManager.FUNCTION_NCM, mUsbHandler.getEnabledFunctions() & rndisPlusNcm); + } + @SmallTest @Test public void enableAdb() {