Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge "Add UsbHandlerTest test for NCM and RNDIS at the same time." am: d6d96a4625 am: b6925c2fc7 am: 39645c256c" into sc-dev am: 7a2801ab11

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1565204

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id9f243be57a5fa1c6ccc7919d602b281b7247eaf
This commit is contained in:
Automerger Merge Worker
2021-02-02 01:45:56 +00:00
parent e64e1b7841 7a2801ab11
commit cc67de4f03
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/UsbTests/src/com/android/server/usb/UsbHandlerTest.java
View File

@@ -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() {