summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorStephen Bird <sbird@cyngn.com>2015-06-05 16:08:25 -0700
committerSteve Kondik <steve@cyngn.com>2015-10-27 15:11:37 -0700
commit122d76e99ee0f7858eab2536042fb0e75f9f9f5a (patch)
tree75e3c0f01061640d87e118880a1995b6f00f563f /media
parent296a90e62886be76bc2173004b014cb243c7b018 (diff)
downloadframeworks_base-122d76e99ee0f7858eab2536042fb0e75f9f9f5a.zip
frameworks_base-122d76e99ee0f7858eab2536042fb0e75f9f9f5a.tar.gz
frameworks_base-122d76e99ee0f7858eab2536042fb0e75f9f9f5a.tar.bz2
MediaScanner: Detect folders
If folders are ignored, MTP will show folders as files Change-Id: I960b92ed2f17c7da635d369e3c37560e167485a1 (cherry picked from commit 63b5c3dc0d75d17e4d35b3397faa5409a53b8e99) (cherry picked from commit 0e543c26b691925a67dbe60210aee1561850cee9)
Diffstat (limited to 'media')
-rw-r--r--media/java/android/media/MediaScanner.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/java/android/media/MediaScanner.java b/media/java/android/media/MediaScanner.java
index 9ea6722..159f457 100644
--- a/media/java/android/media/MediaScanner.java
+++ b/media/java/android/media/MediaScanner.java
@@ -1364,7 +1364,7 @@ public class MediaScanner
// always scan the file, so we can return the content://media Uri for existing files
return mClient.doScanFile(path, mimeType, lastModifiedSeconds, file.length(),
- false, true, MediaScanner.isNoMediaPath(path));
+ file.isDirectory(), true, MediaScanner.isNoMediaPath(path));
} catch (RemoteException e) {
Log.e(TAG, "RemoteException in MediaScanner.scanFile()", e);
return null;