Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rework thumbnail cleanup" into oc-mr1-dev

Browse Source 
am: b20a329f4c

Change-Id: I17b77312edb4fa03af1e89543ed5c27f4501d51c
This commit is contained in:
Marco Nelissen
2018-03-09 23:00:20 +00:00
committed by android-build-merger
parent c4ee36b84f b20a329f4c
commit 6db0f4dac8
3 changed files with 54 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/provider/MediaStore.java
View File

@@ -692,8 +692,8 @@ public final class MediaStore {
// Log.v(TAG, "getThumbnail: origId="+origId+", kind="+kind+", isVideo="+isVideo);
// If the magic is non-zero, we simply return thumbnail if it does exist.
// querying MediaProvider and simply return thumbnail.
MiniThumbFile thumbFile = new MiniThumbFile(isVideo ? Video.Media.EXTERNAL_CONTENT_URI
: Images.Media.EXTERNAL_CONTENT_URI);
MiniThumbFile thumbFile = MiniThumbFile.instance(
isVideo ? Video.Media.EXTERNAL_CONTENT_URI : Images.Media.EXTERNAL_CONTENT_URI);
Cursor c = null;
try {
long magic = thumbFile.getMagic(origId);