Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dec29021 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Gallery2: request thumb if fail to get region decoder"

parents 005feabd b4445260

src/com/android/gallery3d/app/SinglePhotoDataAdapter.java

+10 −2
Original line number Diff line number Diff line
@@ -89,7 +89,16 @@ public class SinglePhotoDataAdapter extends TileImageViewAdapter 
        @Override

        public void onFutureDone(Future<BitmapRegionDecoder> future) {

            BitmapRegionDecoder decoder = future.get();

            if (decoder == null) return;

            // cannot get large bitmap, then try to get thumb bitmap

            if (decoder == null) {

                if (mTask != null && !mTask.isCancelled()) {

                    Log.w(TAG, "fail to get region decoder, try to request thumb image");

                    mHasFullImage = false;

                    pause();

                    resume();

                }

                return;

            }

            int width = decoder.getWidth();

            int height = decoder.getHeight();

            BitmapFactory.Options options = new BitmapFactory.Options();
@@ -136,7 +145,6 @@ public class SinglePhotoDataAdapter extends TileImageViewAdapter 
            Bitmap backup = future.get();

            if (backup == null) {

                mLoadingState = LOADING_FAIL;

                return;

            } else {

                mLoadingState = LOADING_COMPLETE;

            }