summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcaozhiyuan <cao.zhiyuan@zte.com.cn>2017-06-21 22:56:31 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-06-21 22:56:31 +0000
commit20e008f81306615a454dda8af041fddbfc09f6b0 (patch)
tree2f62dc6e760766bd7ff651b0d7e32a7f46e124a4
parent1adc43272897b5d763dfec11595bed433527a847 (diff)
parentae3ef29bf92856b4f3538caac9647079475ac1e2 (diff)
downloadMediaProvider-20e008f81306615a454dda8af041fddbfc09f6b0.tar.gz
Merge "Remove redundant scan on boot completion." am: e17e9e942a am: 1585191f62
am: ae3ef29bf9 Change-Id: I1d3f4535b9f0e394e76cc3fb73fd30b6cb2ee4c6
-rw-r--r--src/com/android/providers/media/MediaScannerReceiver.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/com/android/providers/media/MediaScannerReceiver.java b/src/com/android/providers/media/MediaScannerReceiver.java
index 89635b9d5..8a098af55 100644
--- a/src/com/android/providers/media/MediaScannerReceiver.java
+++ b/src/com/android/providers/media/MediaScannerReceiver.java
@@ -36,10 +36,8 @@ public class MediaScannerReceiver extends BroadcastReceiver {
final String action = intent.getAction();
final Uri uri = intent.getData();
if (Intent.ACTION_BOOT_COMPLETED.equals(action)) {
- // Scan both internal and external storage
+ // Scan internal only.
scan(context, MediaProvider.INTERNAL_VOLUME);
- scan(context, MediaProvider.EXTERNAL_VOLUME);
-
} else {
if (uri.getScheme().equals("file")) {
// handle intents related to external storage