Merge CAF branch 'caf/LA.BR.1.2.1_rb2.17' into caf/cm-12.0.

6 files changed, 41 insertions, 4 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8b15d6cd0..bfa9308d1 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -20,6 +20,7 @@
 <manifest android:versionCode="40030"
         android:versionName="1.1.40030"
         xmlns:android="http://schemas.android.com/apk/res/android"
+        android:sharedUserId="android.uid.system"
         package="com.android.gallery3d">
 
     <original-package android:name="com.android.gallery3d" />
diff --git a/src/com/android/gallery3d/app/AbstractGalleryActivity.java b/src/com/android/gallery3d/app/AbstractGalleryActivity.java
index 9af1fb8ba..ae30cb0aa 100644
--- a/src/com/android/gallery3d/app/AbstractGalleryActivity.java
+++ b/src/com/android/gallery3d/app/AbstractGalleryActivity.java
@@ -133,6 +133,15 @@ public class AbstractGalleryActivity extends Activity implements GalleryContext
         return mGLRootView;
     }
 
+    public void GLRootResume(boolean isResume) {
+        if (isResume) {
+            mGLRootView.onResume();
+            mGLRootView.lockRenderThread();
+        } else {
+            mGLRootView.unlockRenderThread();
+        }
+    }
+
     public OrientationManager getOrientationManager() {
         return mOrientationManager;
     }
diff --git a/src/com/android/gallery3d/app/MuteVideo.java b/src/com/android/gallery3d/app/MuteVideo.java
index a385fbb9f..dd05397d2 100644..100755
--- a/src/com/android/gallery3d/app/MuteVideo.java
+++ b/src/com/android/gallery3d/app/MuteVideo.java
@@ -87,9 +87,19 @@ public class MuteVideo {
                     VideoUtils.startMute(mFilePath, mDstFileInfo);
                     SaveVideoFileUtils.insertContent(
                             mDstFileInfo, mActivity.getContentResolver(), mUri);
-                } catch (IOException e) {
-                    Toast.makeText(mActivity, mActivity.getString(R.string.video_mute_err),
-                            Toast.LENGTH_SHORT).show();
+                } catch (Exception e) {
+                    mHandler.post(new Runnable() {
+                    @Override
+                        public void run() {
+                            Toast.makeText(mActivity, mActivity.getString(R.string.video_mute_err),
+                                Toast.LENGTH_SHORT).show();
+                            if (mMuteProgress != null) {
+                                mMuteProgress.dismiss();
+                                mMuteProgress = null;
+                            }
+                        }
+                    });
+                    return;
                 }
                 // After muting is done, trigger the UI changed.
                 mHandler.post(new Runnable() {
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java
index 2deab3234..b5a4d5640 100755
--- a/src/com/android/gallery3d/app/PhotoPage.java
+++ b/src/com/android/gallery3d/app/PhotoPage.java
@@ -1631,6 +1631,15 @@ public abstract class PhotoPage extends ActivityState implements
     }
 
     @Override
+    public void onConfigurationChanged(Configuration config) {
+        super.onConfigurationChanged(config);
+        if(mIsActive) return;
+        mActivity.GLRootResume(true);
+        mModel.resume();
+        mActivity.GLRootResume(false);
+    }
+
+    @Override
     protected void onResume() {
         super.onResume();
 
diff --git a/src/com/android/gallery3d/app/TrimVideo.java b/src/com/android/gallery3d/app/TrimVideo.java
index c5d721274..a52c25606 100644
--- a/src/com/android/gallery3d/app/TrimVideo.java
+++ b/src/com/android/gallery3d/app/TrimVideo.java
@@ -57,6 +57,7 @@ public class TrimVideo extends Activity implements
 
     private int mTrimStartTime = 0;
     private int mTrimEndTime = 0;
+    private boolean mCheckTrimStartTime;
     private int mVideoPosition = 0;
     public static final String KEY_TRIM_START = "trim_start";
     public static final String KEY_TRIM_END = "trim_end";
@@ -177,10 +178,11 @@ public class TrimVideo extends Activity implements
         mVideoPosition = mVideoView.getCurrentPosition();
         // If the video position is smaller than the starting point of trimming,
         // correct it.
-        if (mVideoPosition < mTrimStartTime) {
+        if (mCheckTrimStartTime && (mVideoPosition < mTrimStartTime)) {
             mVideoView.seekTo(mTrimStartTime);
             mVideoPosition = mTrimStartTime;
         }
+        mCheckTrimStartTime = false;
         // If the position is bigger than the end point of trimming, show the
         // replay button and pause.
         if (mVideoPosition >= mTrimEndTime && mTrimEndTime > 0) {
@@ -204,6 +206,7 @@ public class TrimVideo extends Activity implements
 
     private void playVideo() {
         mVideoView.start();
+        mCheckTrimStartTime = true;
         mController.showPlaying();
         setProgress();
     }
diff --git a/src/com/android/gallery3d/app/VideoUtils.java b/src/com/android/gallery3d/app/VideoUtils.java
index 76d5d1e02..4f551a67d 100644..100755
--- a/src/com/android/gallery3d/app/VideoUtils.java
+++ b/src/com/android/gallery3d/app/VideoUtils.java
@@ -226,6 +226,11 @@ public class VideoUtils {
         } catch (IllegalStateException e) {
             // Swallow the exception due to malformed source.
             Log.w(LOGTAG, "The source video file is malformed");
+            File f = new File(dstPath);
+            if (f.exists()) {
+                f.delete();
+            }
+            throw e;
         } finally {
             muxer.release();
         }