commit bf28d6746389d34a9010e096cfd07ca92c271ad5
author Mike Lockwood <lockwood@google.com> Wed Aug 22 10:02:01 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 22 10:02:01 2012 -0700
tree 29bb5cb3b5e6178ff9acbaea7eef4c375bda9ff7
parent 7b8179318e01590b9b671815e74cbcf4680e716b
parent cfb9c213d7bbcddae215f85343385adb9631a15d

am cfb9c213: am b7fb6600: am 7021e104: Merge "MtpService: check primary storage status when use it in PTP mode"

* commit 'cfb9c213d7bbcddae215f85343385adb9631a15d':
  MtpService: check primary storage status when use it in PTP mode

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);