From 422bf6702f4f099e6fd4fab4c26b0deaeb684e9f Mon Sep 17 00:00:00 2001
From: Mike Lockwood <lockwood@android.com>
Date: Mon, 20 Jun 2011 21:54:55 -0400
Subject: [PATCH] USB: Make MTP/PTP toggle in the USB preferences set the
 default mode

Change-Id: I438f7f24f06298ad41a99199c26c45bd7884afdd
Signed-off-by: Mike Lockwood <lockwood@android.com>
---
 .../src/com/android/systemui/usb/UsbPreferenceActivity.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/SystemUI/src/com/android/systemui/usb/UsbPreferenceActivity.java b/packages/SystemUI/src/com/android/systemui/usb/UsbPreferenceActivity.java
index 3ed44e86b0a9d..187a486f8ce23 100644
--- a/packages/SystemUI/src/com/android/systemui/usb/UsbPreferenceActivity.java
+++ b/packages/SystemUI/src/com/android/systemui/usb/UsbPreferenceActivity.java
@@ -78,8 +78,10 @@ public class UsbPreferenceActivity extends Activity implements View.OnClickListe
         if (v.equals(mMtpPtpButton)) {
             if (mPtpActive) {
                 mUsbManager.setPrimaryFunction(UsbManager.USB_FUNCTION_MTP);
+                mUsbManager.setDefaultFunction(UsbManager.USB_FUNCTION_MTP);
             } else {
                 mUsbManager.setPrimaryFunction(UsbManager.USB_FUNCTION_PTP);
+                mUsbManager.setDefaultFunction(UsbManager.USB_FUNCTION_PTP);
             }
         } else if (v.equals(mInstallerCdButton)) {
             mUsbManager.setPrimaryFunction(UsbManager.USB_FUNCTION_MASS_STORAGE);