1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/camera/AndroidCameraManagerImpl.java b/src/com/android/camera/AndroidCameraManagerImpl.java
index d9e21fdd0..ac9b7eb4e 100644
--- a/src/com/android/camera/AndroidCameraManagerImpl.java
+++ b/src/com/android/camera/AndroidCameraManagerImpl.java
@@ -814,7 +814,10 @@ class AndroidCameraManagerImpl implements CameraManager {
 
         private CameraOpenErrorCallbackForward(
                 Handler h, CameraOpenErrorCallback cb) {
-            mHandler = h;
+            // Given that we are using the main thread handler, we can create it
+            // here instead of holding onto the PhotoModule objects. In this
+            // way, we can avoid memory leak.
+            mHandler = new Handler(Looper.getMainLooper());
             mCallback = cb;
         }