diff options
| author | leozwang <leozwang@google.com> | 2015-02-06 13:19:36 -0800 |
|---|---|---|
| committer | leozwang <leozwang@google.com> | 2015-02-06 13:34:30 -0800 |
| commit | d1f37448350890725736ababcc23c7deb0b2153f (patch) | |
| tree | 0a8dd69c86600bc2ac0d75b134720283ace2211d /src | |
| parent | d1b7c58a1c14229873987af728c4c598f86bd107 (diff) | |
| download | android_packages_providers_MediaProvider-d1f37448350890725736ababcc23c7deb0b2153f.tar.gz android_packages_providers_MediaProvider-d1f37448350890725736ababcc23c7deb0b2153f.tar.bz2 android_packages_providers_MediaProvider-d1f37448350890725736ababcc23c7deb0b2153f.zip | |
Check mCurrentThumbRequest.mPath to prevent crash.
Bug: 19246412
Change-Id: I25c2f09ded0527ac062d9c8a57adf3aa7639ea76
Diffstat (limited to 'src')
| -rwxr-xr-x | src/com/android/providers/media/MediaProvider.java | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/src/com/android/providers/media/MediaProvider.java b/src/com/android/providers/media/MediaProvider.java index ee4aad3e..c96028ed 100755 --- a/src/com/android/providers/media/MediaProvider.java +++ b/src/com/android/providers/media/MediaProvider.java @@ -619,24 +619,26 @@ public class MediaProvider extends ContentProvider { Log.w(TAG, "Have message but no request?"); } else { try { - File origFile = new File(mCurrentThumbRequest.mPath); - if (origFile.exists() && origFile.length() > 0) { - mCurrentThumbRequest.execute(); - // Check if more requests for the same image are queued. - synchronized (mMediaThumbQueue) { - for (MediaThumbRequest mtq : mMediaThumbQueue) { - if ((mtq.mOrigId == mCurrentThumbRequest.mOrigId) && - (mtq.mIsVideo == mCurrentThumbRequest.mIsVideo) && - (mtq.mMagic == 0) && - (mtq.mState == MediaThumbRequest.State.WAIT)) { - mtq.mMagic = mCurrentThumbRequest.mMagic; + if (mCurrentThumbRequest.mPath != null) { + File origFile = new File(mCurrentThumbRequest.mPath); + if (origFile.exists() && origFile.length() > 0) { + mCurrentThumbRequest.execute(); + // Check if more requests for the same image are queued. + synchronized (mMediaThumbQueue) { + for (MediaThumbRequest mtq : mMediaThumbQueue) { + if ((mtq.mOrigId == mCurrentThumbRequest.mOrigId) && + (mtq.mIsVideo == mCurrentThumbRequest.mIsVideo) && + (mtq.mMagic == 0) && + (mtq.mState == MediaThumbRequest.State.WAIT)) { + mtq.mMagic = mCurrentThumbRequest.mMagic; + } } } - } - } else { - // original file hasn't been stored yet - synchronized (mMediaThumbQueue) { - Log.w(TAG, "original file hasn't been stored yet: " + mCurrentThumbRequest.mPath); + } else { + // original file hasn't been stored yet + synchronized (mMediaThumbQueue) { + Log.w(TAG, "original file hasn't been stored yet: " + mCurrentThumbRequest.mPath); + } } } } catch (IOException ex) { |