diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-02-23 13:14:33 -0800 |
|---|---|---|
| committer | Mike Lockwood <lockwood@android.com> | 2011-02-23 13:14:33 -0800 |
| commit | 188d00b07ef0b8968868b3489e80dd9f53d3bafa (patch) | |
| tree | 06f0784819432134832e7d20e5a61475e33c16db /media/java | |
| parent | 16dc3073a2f06a77d9873e536f633a4adf575fce (diff) | |
| download | frameworks_base-188d00b07ef0b8968868b3489e80dd9f53d3bafa.zip frameworks_base-188d00b07ef0b8968868b3489e80dd9f53d3bafa.tar.gz frameworks_base-188d00b07ef0b8968868b3489e80dd9f53d3bafa.tar.bz2 | |
UsbManager: Remove redundant Intent extras from USB device and accessory broadcasts
These extras are also accessable via the UsbDevice and UsbAccessory classes,
which are also included as extras.
Since you can't filter Intents based on extras there is no point in duplicating
this information as separate extras.
Change-Id: I4c8d1e70d66023a1800b3f8f06118898da6b37af
Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'media/java')
| -rw-r--r-- | media/java/android/mtp/MtpClient.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/media/java/android/mtp/MtpClient.java b/media/java/android/mtp/MtpClient.java index 568ac94..a5ee77c 100644 --- a/media/java/android/mtp/MtpClient.java +++ b/media/java/android/mtp/MtpClient.java @@ -48,15 +48,14 @@ public class MtpClient { private final BroadcastReceiver mUsbReceiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { - String deviceName = intent.getStringExtra(UsbManager.EXTRA_DEVICE_NAME); + UsbDevice usbDevice = (UsbDevice)intent.getParcelableExtra(UsbManager.EXTRA_DEVICE); + String deviceName = usbDevice.getDeviceName(); synchronized (mDeviceList) { MtpDevice mtpDevice = getDeviceLocked(deviceName); if (UsbManager.ACTION_USB_DEVICE_ATTACHED.equals(intent.getAction())) { if (mtpDevice == null) { - UsbDevice usbDevice = - (UsbDevice)intent.getParcelableExtra(UsbManager.EXTRA_DEVICE); mtpDevice = openDevice(usbDevice); } if (mtpDevice != null) { |