diff options
| author | Nick Kralevich <nnk@google.com> | 2015-07-30 16:32:48 -0700 |
|---|---|---|
| committer | Nick Kralevich <nnk@google.com> | 2015-07-30 16:34:01 -0700 |
| commit | 8a9b03f746233fa00d4e32f018acac919c824f6f (patch) | |
| tree | 39ed6ae824c4e2521ece4f78e8b93675b6afd4ce /res | |
| parent | 6b0a2d21e65ab1c29aec925380bbf43bab22c2c1 (diff) | |
| download | packages_apps_Settings-8a9b03f746233fa00d4e32f018acac919c824f6f.zip packages_apps_Settings-8a9b03f746233fa00d4e32f018acac919c824f6f.tar.gz packages_apps_Settings-8a9b03f746233fa00d4e32f018acac919c824f6f.tar.bz2 | |
UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER
In ec323a0849155302b3b522fe34a2638be74af420, DISALLOW_USB_FILE_TRANSFER
turned off all USB options except for "Charge Only". This is too
aggressive. MIDI should be available when DISALLOW_USB_FILE_TRANSFER
is set.
Remove mUsbManager.isUsbDataUnlocked(). That data is available
by accessing the sticky broadcast.
Bug: 22447614
Bug: 21429947
Change-Id: Icd8398c4cf43f807acf77923b0b25c18f9a9b0d0
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/arrays.xml | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 97f5ead..e5f1988 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -1389,12 +1389,4 @@ <item>0</item> </string-array> - <!-- These values must match up with the code in UsbModeChooserActivity.java. --> - <string-array name="usb_available_functions"> - <item>@string/usb_use_charging_only</item> - <item>@string/usb_use_file_transfers</item> - <item>@string/usb_use_photo_transfers</item> - <item>@string/usb_use_MIDI</item> - </string-array> - </resources> |