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

Commit e96b2e1f authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Promotion of android_ui.lnx.2.1-00006. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1060330   Ic5fb21c3f8d8ee2510af61fce59e7c2298c52f34   SnapdragonGallery: Fix can't resume play when calling ti
1062647   I5e0edecf18561f90d913844b44a314c79b2b66fe   SnapdragonGallery: Fix crash mModel is null in monkeytes

Change-Id: I2cd8d682a07918995d708a03e9b6f2fe7222127f
CRs-Fixed: 1060330, 1062647
parents ab0d5743 6948304f

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

+1 −0
Original line number Diff line number Diff line
@@ -1371,6 +1371,7 @@ public class MoviePlayer implements 
                                    Log.v(TAG, "PositiveButton.onClick() mIsShowDialog="

                                            + mIsShowDialog);

                                }

                                mVideoView.setDialogShowState(false);

                                doStartVideo(true, mVideoPosition, mVideoLastDuration);

                            }

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

+3 −1
Original line number Diff line number Diff line
@@ -1415,9 +1415,11 @@ public abstract class PhotoPage extends ActivityState implements 
                mActivity.getStateManager().startState(SinglePhotoPage.class, data);

                return;

            }

            if (null != mModel) {

                mModel.setCurrentPhoto(path, mCurrentIndex);

            }

        }

    }



    @Override

    protected void onStateResult(int requestCode, int resultCode, Intent data) {