diff options
| author | Jerry Zhang <zhangjerry@google.com> | 2016-10-13 10:48:00 -0700 |
|---|---|---|
| committer | Jerry Zhang <zhangjerry@google.com> | 2017-01-24 13:27:29 -0800 |
| commit | 8f48959f90c85fc58bd057a9d1c399350055bf0f (patch) | |
| tree | 1e431baf44d4841cbfb2ccd82a57f07f1ac87d2b | |
| parent | 36cf84ddb1a7c3835a0e06d2d61e383bf2d8ccc0 (diff) | |
| download | TvSettings-8f48959f90c85fc58bd057a9d1c399350055bf0f.tar.gz | |
Refactor setCurrentFunction and setUsbDataUnlocked into one method.
Bug : 31814300
Test: Refactor. Existing tests pass.
Change-Id: Id43f677e80efdbbb6653d3a755d0b2a7320f658a
(cherry picked from commit 2e2a4357179d20c92e076f39df925d0b6dbb532c)
| -rw-r--r-- | Settings/src/com/android/tv/settings/system/development/DevelopmentFragment.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Settings/src/com/android/tv/settings/system/development/DevelopmentFragment.java b/Settings/src/com/android/tv/settings/system/development/DevelopmentFragment.java index 3ead452d2..a2fd26a86 100644 --- a/Settings/src/com/android/tv/settings/system/development/DevelopmentFragment.java +++ b/Settings/src/com/android/tv/settings/system/development/DevelopmentFragment.java @@ -1309,11 +1309,10 @@ public class DevelopmentFragment extends LeanbackPreferenceFragment private void writeUsbConfigurationOption(Object newValue) { UsbManager manager = (UsbManager)getActivity().getSystemService(Context.USB_SERVICE); String function = newValue.toString(); - manager.setCurrentFunction(function); if (function.equals("none")) { - manager.setUsbDataUnlocked(false); + manager.setCurrentFunction(function, false); } else { - manager.setUsbDataUnlocked(true); + manager.setCurrentFunction(function, true); } } |