commit 60fb6d201a9fe1831c3dc8c201bc927c40fe98a6
author Marco Nelissen <marcone@google.com> Sat Jul 04 08:04:30 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Jul 04 08:04:30 2015 +0000
tree a3903a06040530af144b2a4a3be2bb319744372e
parent 3de1dff6cb208c4831d74920b983ddd544640466
parent a0918440803bcfa1d28472d70dd0e37ca79814fb

am a0918440: am f35bd641: am b8b20a50: Merge "Fix USB mode development setting" into mnc-dev

* commit 'a0918440803bcfa1d28472d70dd0e37ca79814fb':
  Fix USB mode development setting

src/com/android/settings/DevelopmentSettings.java

diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 89b081a..dbf55a9 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -1352,7 +1352,13 @@
 
     private void writeUsbConfigurationOption(Object newValue) {
         UsbManager manager = (UsbManager)getActivity().getSystemService(Context.USB_SERVICE);
-        manager.setCurrentFunction(newValue.toString());
+        String function = newValue.toString();
+        manager.setCurrentFunction(function);
+        if (function.equals("none")) {
+            manager.setUsbDataUnlocked(false);
+        } else {
+            manager.setUsbDataUnlocked(true);
+        }
     }
 
     private void updateCpuUsageOptions() {