commit 5d36a177d95184aaa0763d07aa38ff028f5a9b9c
author Jerry Zhang <zhangjerry@google.com> Wed Oct 12 14:42:56 2016 -0700
committer Jerry Zhang <zhangjerry@google.com> Thu Oct 13 17:32:22 2016 -0700
tree e4fe87ed2cac7b66ad2d15e9b902e6c2efabd32d
parent 2b03a7d092b8e0267833915ab7e770621ea45c47

Refactor setCurrentFunction and setUsbDataUnlocked into one method

This allows us to get rid of an extraneous config switch and
simplify some code.

Test: Manually change usb configuration
Change-Id: Id78da530ff485ecd7a915056832eec1dd8c91954

src/com/android/settings/DevelopmentSettings.java

diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index e41502c..32aaaf0 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -1707,11 +1707,10 @@
     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);
         }
     }
 

src/com/android/settings/deviceinfo/UsbBackend.java

diff --git a/src/com/android/settings/deviceinfo/UsbBackend.java b/src/com/android/settings/deviceinfo/UsbBackend.java
index cd88709..e648b39 100644
--- a/src/com/android/settings/deviceinfo/UsbBackend.java
+++ b/src/com/android/settings/deviceinfo/UsbBackend.java
@@ -101,20 +101,16 @@
     private void setUsbFunction(int mode) {
         switch (mode) {
             case MODE_DATA_MTP:
-                mUsbManager.setCurrentFunction(UsbManager.USB_FUNCTION_MTP);
-                mUsbManager.setUsbDataUnlocked(true);
+                mUsbManager.setCurrentFunction(UsbManager.USB_FUNCTION_MTP, true);
                 break;
             case MODE_DATA_PTP:
-                mUsbManager.setCurrentFunction(UsbManager.USB_FUNCTION_PTP);
-                mUsbManager.setUsbDataUnlocked(true);
+                mUsbManager.setCurrentFunction(UsbManager.USB_FUNCTION_PTP, true);
                 break;
             case MODE_DATA_MIDI:
-                mUsbManager.setCurrentFunction(UsbManager.USB_FUNCTION_MIDI);
-                mUsbManager.setUsbDataUnlocked(true);
+                mUsbManager.setCurrentFunction(UsbManager.USB_FUNCTION_MIDI, true);
                 break;
             default:
-                mUsbManager.setCurrentFunction(null);
-                mUsbManager.setUsbDataUnlocked(false);
+                mUsbManager.setCurrentFunction(null, false);
                 break;
         }
     }