tree 5eed96a0000b88890f77a730cecf031f8697099b
parent dfacad026dfc1582504969f8b268e7c3970c4496
author Jerry Zhang <zhangjerry@google.com> 1476312572 -0700
committer Jerry Zhang <zhangjerry@google.com> 1479252585 -0800

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
(cherry picked from commit 7a396be6d5ba8914933a54b5bfac25e118db0e9f)