diff options
| author | Marco Nelissen <marcone@google.com> | 2014-12-04 19:52:18 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-04 19:52:18 +0000 |
| commit | 91a80e32495a825afc3bb13428d3154bf394d747 (patch) | |
| tree | d16a87116a138ecbe345b396f995acac09a98673 /src | |
| parent | d60468b0587d5a579c85f644201e5caff5b5b116 (diff) | |
| parent | 9200927da3277128cfb517d54cea8be52d6ae602 (diff) | |
| download | android_packages_providers_MediaProvider-91a80e32495a825afc3bb13428d3154bf394d747.tar.gz android_packages_providers_MediaProvider-91a80e32495a825afc3bb13428d3154bf394d747.tar.bz2 android_packages_providers_MediaProvider-91a80e32495a825afc3bb13428d3154bf394d747.zip | |
am 9200927d: Merge "MediaProvider: When insert files to "internal.db", Don\'t notify MTP."
* commit '9200927da3277128cfb517d54cea8be52d6ae602':
MediaProvider: When insert files to "internal.db", Don't notify MTP.
Diffstat (limited to 'src')
| -rwxr-xr-x | src/com/android/providers/media/MediaProvider.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/com/android/providers/media/MediaProvider.java b/src/com/android/providers/media/MediaProvider.java index ee4aad3e..6044d996 100755 --- a/src/com/android/providers/media/MediaProvider.java +++ b/src/com/android/providers/media/MediaProvider.java @@ -2877,7 +2877,11 @@ public class MediaProvider extends ContentProvider { } // Notify MTP (outside of successful transaction) - notifyMtp(notifyRowIds); + if (uri != null) { + if (uri.toString().startsWith("content://media/external/")) { + notifyMtp(notifyRowIds); + } + } getContext().getContentResolver().notifyChange(uri, null); return numInserted; @@ -2889,7 +2893,11 @@ public class MediaProvider extends ContentProvider { ArrayList<Long> notifyRowIds = new ArrayList<Long>(); Uri newUri = insertInternal(uri, match, initialValues, notifyRowIds); - notifyMtp(notifyRowIds); + if (uri != null) { + if (uri.toString().startsWith("content://media/external/")) { + notifyMtp(notifyRowIds); + } + } // do not signal notification for MTP objects. // we will signal instead after file transfer is successful. |