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

Commit 529f5341 authored by Wei Huang's avatar Wei Huang Committed by Android (Google) Code Review
Browse files

Merge "Fix 5556160 Crash in gallery after playing slideshow Crespo IML33B." into ics-mr1

parents cc2f8c4e 50620061

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

+2 −1
Original line number Diff line number Diff line
@@ -203,7 +203,8 @@ public class SlideshowPage extends ActivityState { 
            setStateResult(Activity.RESULT_OK, mResultIntent.putExtra(KEY_PHOTO_INDEX, 0));

        } else {

            int index = data.getInt(KEY_PHOTO_INDEX);

            Path path = Path.fromString(data.getString(KEY_ITEM_PATH));

            String itemPath = data.getString(KEY_ITEM_PATH);

            Path path = itemPath != null ? Path.fromString(itemPath) : null;

            boolean repeat = data.getBoolean(KEY_REPEAT);

            mModel = new SlideshowDataAdapter(mActivity, new SequentialSource(mediaSet, repeat),

                    index, path);