Make sure startAnimation won't be called after onPause.

Change-Id: I6c5238394b2ad64e22fbcb250ecd1534da7e8d03
fix: 5629252

1 files changed, 10 insertions, 3 deletions

diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java
index ec7d16175..5d0fd15c7 100644
--- a/src/com/android/gallery3d/app/PhotoPage.java
+++ b/src/com/android/gallery3d/app/PhotoPage.java
@@ -17,8 +17,8 @@
 package com.android.gallery3d.app;
 
 import android.app.ActionBar;
-import android.app.Activity;
 import android.app.ActionBar.OnMenuVisibilityListener;
+import android.app.Activity;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
@@ -30,8 +30,8 @@ import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.WindowManager;
 import android.view.View.MeasureSpec;
+import android.view.WindowManager;
 import android.widget.ShareActionProvider;
 import android.widget.Toast;
 
@@ -344,6 +344,7 @@ public class PhotoPage extends ActivityState
         }
     }
 
+    @Override
     public void onUserInteraction() {
         showBars();
         refreshHidingMessage();
@@ -359,15 +360,21 @@ public class PhotoPage extends ActivityState
         }
     }
 
+    @Override
     public void onUserInteractionBegin() {
         showBars();
         mIsInteracting = true;
         refreshHidingMessage();
     }
 
+    @Override
     public void onUserInteractionEnd() {
         mIsInteracting = false;
-        refreshHidingMessage();
+
+        // This function could be called from GL thread (in SlotView.render)
+        // and post to the main thread. So, it could be executed while the
+        // activity is paused.
+        if (mIsActive) refreshHidingMessage();
     }
 
     @Override