Merge change 710 into donut

* changes:
  Remove unnecessary allowThreadDecoding.

5 files changed, 0 insertions, 5 deletions

diff --git a/src/com/android/camera/BitmapThread.java b/src/com/android/camera/BitmapThread.java
index 2ea5ba0..971f6c6 100644
--- a/src/com/android/camera/BitmapThread.java
+++ b/src/com/android/camera/BitmapThread.java
@@ -53,7 +53,6 @@ class BitmapThread {
     }
 
     public synchronized void start() {
-        BitmapManager.instance().allowThreadDecoding(mThread);
         mThread.start();
     }
 
diff --git a/src/com/android/camera/CropImage.java b/src/com/android/camera/CropImage.java
index 616a851..99817ac 100644
--- a/src/com/android/camera/CropImage.java
+++ b/src/com/android/camera/CropImage.java
@@ -105,7 +105,6 @@ public class CropImage extends Activity {
         BitmapManager bitmapManager = BitmapManager.instance();
         bitmapManager.setCheckResourceLock(false);
         bitmapManager.allowAllDecoding();
-        bitmapManager.allowThreadDecoding(Thread.currentThread());
 
         try {
             Intent intent = getIntent();
diff --git a/src/com/android/camera/GridViewSpecial.java b/src/com/android/camera/GridViewSpecial.java
index 102f410..c19006e 100644
--- a/src/com/android/camera/GridViewSpecial.java
+++ b/src/com/android/camera/GridViewSpecial.java
@@ -400,7 +400,6 @@ class GridViewSpecial extends View {
                     } // while
                 } // run
             });
-            BitmapManager.instance().allowThreadDecoding(mWorkerThread);
             mWorkerThread.setName("image-block-manager");
             mWorkerThread.start();
         }
diff --git a/src/com/android/camera/ImageLoader.java b/src/com/android/camera/ImageLoader.java
index 778d3b9..5625654 100644
--- a/src/com/android/camera/ImageLoader.java
+++ b/src/com/android/camera/ImageLoader.java
@@ -201,7 +201,6 @@ public class ImageLoader {
         mDone = false;
         Thread t = new Thread(new WorkerThread());
         t.setName("image-loader");
-        BitmapManager.instance().allowThreadDecoding(t);
         mDecodeThread = t;
         t.start();
     }
diff --git a/src/com/android/camera/ViewImage.java b/src/com/android/camera/ViewImage.java
index 0139be6..0d44e09 100644
--- a/src/com/android/camera/ViewImage.java
+++ b/src/com/android/camera/ViewImage.java
@@ -335,7 +335,6 @@ public class ViewImage extends Activity implements View.OnClickListener {
                                });
                             }
                         };
-                        BitmapManager.instance().allowThreadDecoding(t);
                         t.start();
                     }
                 });