SnapdragonCamera: Fix NPE in camera open if UI creation takes time.

Sometimes null pointer exception is seen because open camera thread
might try to access photo UI though its not created by that time,
due to some timing issues. So, let focus manager initialize without
photo UI and later update it when photo UI is ready.

Change-Id: I7b4c344586115e45269483a614de1e91e1a6ab81

1 files changed, 7 insertions, 1 deletions

diff --git a/src/com/android/camera/FocusOverlayManager.java b/src/com/android/camera/FocusOverlayManager.java
index 5efbf0178..c5ffef5c5 100644
--- a/src/com/android/camera/FocusOverlayManager.java
+++ b/src/com/android/camera/FocusOverlayManager.java
@@ -146,6 +146,10 @@ public class FocusOverlayManager {
         mUI = ui;
     }
 
+    public void setPhotoUI(FocusUI ui) {
+        mUI = ui;
+    }
+
     public void setParameters(Parameters parameters) {
         // parameters can only be null when onConfigurationChanged is called
         // before camera is open. We will just return in this case, because
@@ -530,7 +534,9 @@ public class FocusOverlayManager {
         if (!mInitialized) return;
 
         // Put focus indicator to the center. clear reset position
-        mUI.clearFocus();
+        if (mUI != null) {
+            mUI.clearFocus();
+        }
         // Initialize mFocusArea.
         mFocusArea = null;
         // Initialize mMeteringArea.