commit 8bbed3a53d69309f0e6e71623ecdf7c5e637e85d
author Bill Yi <byi@google.com> Fri Apr 30 01:25:32 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 30 01:25:32 2021 +0000
tree 807b6cf355c24fd420f9a4849d8482520feb22cf
parent 52a8c72869dc84739cbf398e68800383d8b551d5
parent 76e97e1445c3f6b46fb0e8a2cc3adc7cda746363

Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev

src/com/android/providers/media/scan/ModernMediaScanner.java

diff --git a/src/com/android/providers/media/scan/ModernMediaScanner.java b/src/com/android/providers/media/scan/ModernMediaScanner.java
index 4915de9..9a38945 100644
--- a/src/com/android/providers/media/scan/ModernMediaScanner.java
+++ b/src/com/android/providers/media/scan/ModernMediaScanner.java
@@ -367,7 +367,11 @@
             mRoot = root;
             mReason = reason;
 
-            mVolume = MediaVolume.fromStorageVolume(FileUtils.getStorageVolume(mContext, root));
+            if (FileUtils.contains(Environment.getStorageDirectory(), root)) {
+                mVolume = MediaVolume.fromStorageVolume(FileUtils.getStorageVolume(mContext, root));
+            } else {
+                mVolume = MediaVolume.fromInternal();
+            }
             mVolumeName = mVolume.getName();
             mFilesUri = MediaStore.Files.getContentUri(mVolumeName);
             mSignal = new CancellationSignal();