tree 928db98fae50ef24d72e81464b51126ac1501493
parent 67a769e18ad53d599917d6ff984682418d9982f5
author Jerry Zhang <zhangjerry@google.com> 1476312572 -0700
committer Jerry Zhang <zhangjerry@google.com> 1476405141 -0700

Refactored setCurrentFunction and setUsbDataUnlocked into single method.

This gets rid of an extraneous configuration change when going from
adb to adb + file transfer as previously the config would have been
reset once for functions and once for data unlocked.

It also simplifies some of the code.

Test: manually changing usb configurations
Change-Id: Ica10a195338b2189db13113f44657393db110bee