summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-09-01 23:53:23 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-09-01 23:53:23 -0700
commit7d14564fc24b209bfae953130a1786a91ff22449 (patch)
tree7ae8f4632bab3028c1926dc9e7a5402ee11762f8 /src
parent50ebf4bb05538434e5676fb4f8ffc58fdc1d853f (diff)
parent703cb515c3284fac7ba4d2cb850dbceff9d0e478 (diff)
downloadandroid_packages_apps_Gallery2-7d14564fc24b209bfae953130a1786a91ff22449.tar.gz
android_packages_apps_Gallery2-7d14564fc24b209bfae953130a1786a91ff22449.tar.bz2
android_packages_apps_Gallery2-7d14564fc24b209bfae953130a1786a91ff22449.zip
Merge "SnapdragonGallery: Fix force closed when streaming opened with gallery" into android_ui.lnx.2.1-dev
Diffstat (limited to 'src')
-rwxr-xr-x[-rw-r--r--]src/com/android/gallery3d/app/MovieControllerOverlay.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/app/MovieControllerOverlay.java b/src/com/android/gallery3d/app/MovieControllerOverlay.java
index c1e36487d..9ea770c3e 100644..100755
--- a/src/com/android/gallery3d/app/MovieControllerOverlay.java
+++ b/src/com/android/gallery3d/app/MovieControllerOverlay.java
@@ -457,7 +457,7 @@ public class MovieControllerOverlay extends CommonControllerOverlay implements
}
private class OverlayExtension implements IContrllerOverlayExt {
- private State mLastState;
+ private State mLastState = State.LOADING;
private String mPlayingInfo;
// for pause feature
private boolean mCanPause = true;