From e6ffe317547abc583742a02a9272e421c3fe4efb Mon Sep 17 00:00:00 2001
From: Marco Nelissen <marcone@google.com>
Date: Tue, 30 Jun 2015 14:52:04 -0700
Subject: [PATCH] Fix USB mode development setting

USB mode consists of the function (mtp, ptp, midi, etc) and the data
locked/unlocked state. Developer settings was only setting the
function, leaving data locked when it should be unlocked.

Bug: 22165902
Change-Id: Ia1ae8dfaf3d2abc62034aa6aea1234bad04aaa2e
---
 src/com/android/settings/DevelopmentSettings.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 5d9e2bdda08..f20728a6ed0 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -1326,7 +1326,13 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
 
     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() {