am aa52b3d2: Prevent crash for when newData cannot be found.

[android-x86/packages-apps-Camera2.git] / src / com / android / camera / CameraActivity.java

diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 2238178..231adee 100644 (file)
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -69,6 +69,7 @@ import android.view.WindowManager;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.ShareActionProvider;
+
 import com.android.camera.app.AppController;
 import com.android.camera.app.CameraAppUI;
 import com.android.camera.app.CameraController;
@@ -865,6 +866,14 @@ public class CameraActivity extends Activity
                     LocalData newData = LocalMediaData.PhotoData.fromContentUri(
                             getContentResolver(), contentUri);
 
+                    // This can be null if e.g. a session is canceled (e.g.
+                    // through discard panorama). It might be worth adding
+                    // onSessionCanceled or the like this interface.
+                    if (newData == null) {
+                        Log.i(TAG, "onSessionDone: Could not find LocalData for URI: " + contentUri);
+                        return;
+                    }
+
                     final int pos = mDataAdapter.findDataByContentUri(sessionUri);
                     if (pos == -1) {
                         // We do not have a placeholder for this image, perhaps