commit 58019b12e5e9d34da5fa778aacbaebf133672bc7
author The Android Automerger <android-build@android.com> Thu Aug 23 06:34:24 2012 -0700
committer The Android Automerger <android-build@android.com> Thu Aug 23 06:34:24 2012 -0700
tree 9ee25dddeaf5c13c830bf7e5b6b96e3e93441557
parent b7fb66005396514e11589cfcef4e3df346a09420
parent 10aee40577cd1adfefa8ef7acce728f30a1c3d7c

merge in jb-mr1-release history after reset to jb-mr1-dev

src/com/android/providers/media/MtpService.java

diff --git a/src/com/android/providers/media/MtpService.java b/src/com/android/providers/media/MtpService.java
index fce8360..545fcde 100644
--- a/src/com/android/providers/media/MtpService.java
+++ b/src/com/android/providers/media/MtpService.java
@@ -50,7 +50,13 @@
     private void addStorageDevicesLocked() {
         if (mPtpMode) {
             // In PTP mode we support only primary storage
-            addStorageLocked(mVolumeMap.get(mVolumes[0].getPath()));
+            String path = mVolumes[0].getPath();
+            if (path != null) {
+                String state = mStorageManager.getVolumeState(path);
+                if (Environment.MEDIA_MOUNTED.equals(state)) {
+                    addStorageLocked(mVolumeMap.get(mVolumes[0].getPath()));
+                }
+            }
         } else {
             for (StorageVolume volume : mVolumeMap.values()) {
                 addStorageLocked(volume);