commit 1ea6c20393b4bad8d8c2dc68f397719fba0913a5
author Andreea <aiov@google.com> Thu Jan 09 16:14:52 2020 -0800
committer Andreea Iovan <aiov@google.com> Fri Jan 10 15:33:35 2020 +0000
tree a0d729db45e27b823fe7a9b7c68e3d212ff75464
parent 8a7a67a74a0c4deee0a6c5b87cc76a72fc874c8d

Fix changing USB configuration setting.

Bug: 147031737
Test: manual
Change-Id: I510f69a27cb88b4a067d2c6c5b8130e9fcc23477

Settings/src/com/android/tv/settings/system/development/DevelopmentFragment.java

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 2bae3c9..8b4f1ad 100644
--- a/Settings/src/com/android/tv/settings/system/development/DevelopmentFragment.java
+++ b/Settings/src/com/android/tv/settings/system/development/DevelopmentFragment.java
@@ -1340,7 +1340,7 @@
             int index = 0;
             long functions = manager.getCurrentFunctions();
             for (int i = 0; i < titles.length; i++) {
-                if ((functions | UsbManager.usbFunctionsFromString(values[i])) != 0) {
+                if ((functions & UsbManager.usbFunctionsFromString(values[i])) != 0) {
                     index = i;
                     break;
                 }
@@ -1352,7 +1352,7 @@
     }
 
     private void writeUsbConfigurationOption(Object newValue) {
-        UsbManager manager = (UsbManager)getActivity().getSystemService(Context.USB_SERVICE);
+        UsbManager manager = (UsbManager) getActivity().getSystemService(Context.USB_SERVICE);
         String function = newValue.toString();
         manager.setCurrentFunctions(UsbManager.usbFunctionsFromString(function));
     }