commit 0bc3fa751f69c81978b7ba28f7de5ddcd1ae1c10
author Chih-Chung Chang <chihchung@google.com> Wed Jan 27 16:52:24 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 27 16:52:24 2010 -0800
tree c90fe8525745803a3f2305a0a96e4e9f50d8ff05
parent e4ca9a02f5d8f83f9e62cd76faac60e8affae01d
parent 27918e8d7dafecd9310cbb7726b2967f795b3c0b

Merge "Fix to prevent auto-thumbnailer to run on images whose decoding has failed (causing CPU cycles being wasted resulting in sometimes affecting performance of CPU intensive applications such as the video player)" into eclair

src/com/cooliris/media/Gallery.java

diff --git a/src/com/cooliris/media/Gallery.java b/src/com/cooliris/media/Gallery.java
index ee7f9c3..0ea80dd 100644
--- a/src/com/cooliris/media/Gallery.java
+++ b/src/com/cooliris/media/Gallery.java
@@ -42,6 +42,7 @@
     private MediaScannerConnection mConnection;
     private WakeLock mWakeLock;
     private HashMap<String, Boolean> mAccountsEnabled = new HashMap<String, Boolean>();
+    private boolean mDockSlideshow = false;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -60,12 +61,10 @@
                 Toast.makeText(this, getResources().getString(R.string.no_sd_card), Toast.LENGTH_LONG).show();
                 finish();
             } else {
-                PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
-                mWakeLock = pm.newWakeLock(PowerManager.SCREEN_BRIGHT_WAKE_LOCK, "GridView.Slideshow.All");
-                mWakeLock.acquire();
                 Slideshow slideshow = new Slideshow(this);
                 slideshow.setDataSource(new RandomDataSource());
                 setContentView(slideshow);
+                mDockSlideshow = true;
             }
             return;
         }
@@ -190,6 +189,17 @@
     @Override
     public void onResume() {
         super.onResume();
+        if (mDockSlideshow) {
+            if (mWakeLock != null) {
+                if (mWakeLock.isHeld()) {
+                    mWakeLock.release();
+                }
+            }
+            PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
+            mWakeLock = pm.newWakeLock(PowerManager.SCREEN_BRIGHT_WAKE_LOCK, "GridView.Slideshow.All");
+            mWakeLock.acquire();
+            return;
+        }
         if (ImageManager.hasStorage()) {
             CacheService.computeDirtySets(this);
             CacheService.startCache(this, false);
@@ -229,6 +239,12 @@
         super.onPause();
         if (mRenderView != null)
             mRenderView.onPause();
+        if (mWakeLock != null) {
+            if (mWakeLock.isHeld()) {
+                mWakeLock.release();
+            }
+            mWakeLock = null;
+        }
         mPause = true;
     }
 
@@ -261,12 +277,6 @@
             }
             mGridLayer.shutdown();
         }
-        if (mWakeLock != null) {
-            if (mWakeLock.isHeld()) {
-                mWakeLock.release();
-            }
-            mWakeLock = null;
-        }
         if (mReverseGeocoder != null)
             mReverseGeocoder.shutdown();
         if (mRenderView != null) {