SnapdragonCamera: Handle CAMERA_ERROR_SERVER_DIED message gracefully.

Handle CAMERA_ERROR_SERVER_DIED message from lower layers by finishing
the activity and there by closing camera session and app gracefully.
In all other error cases, raise exception and kill app as exists
already.

Change-Id: I86c4caf174356148bd4725329ea13ec82e944b94

1 files changed, 10 insertions, 1 deletions

diff --git a/src/com/android/camera/CameraErrorCallback.java b/src/com/android/camera/CameraErrorCallback.java
index 7029ac427..71fa9cefd 100644
--- a/src/com/android/camera/CameraErrorCallback.java
+++ b/src/com/android/camera/CameraErrorCallback.java
@@ -21,6 +21,11 @@ import android.util.Log;
 public class CameraErrorCallback
         implements android.hardware.Camera.ErrorCallback {
     private static final String TAG = "CameraErrorCallback";
+    public CameraActivity mActivity = null;
+
+    public void setActivity(CameraActivity activity) {
+        mActivity = activity;
+    }
 
     @Override
     public void onError(int error, android.hardware.Camera camera) {
@@ -30,7 +35,11 @@ public class CameraErrorCallback
             // We are not sure about the current state of the app (in preview or
             // snapshot or recording). Closing the app is better than creating a
             // new Camera object.
-            throw new RuntimeException("Media server died.");
+            if (mActivity != null) {
+                mActivity.finish();
+            } else {
+                throw new RuntimeException("Media server died.");
+            }
         }
     }
 }