SnapdragonCamera: Handle Camera device errors gracefully.

Handle Camera device errors from lower layers gracefully by finishing
the activity and there by closing camera session and app.

Also, display a toast message signifying the error because of
which camera app is being shutdown.

Change-Id: I86c4caf174356148bd4725329ea13ec82e944b94

1 files changed, 36 insertions, 6 deletions

diff --git a/src/com/android/camera/CameraErrorCallback.java b/src/com/android/camera/CameraErrorCallback.java
index 7029ac427..dd627bd0a 100644
--- a/src/com/android/camera/CameraErrorCallback.java
+++ b/src/com/android/camera/CameraErrorCallback.java
@@ -17,20 +17,50 @@
 package com.android.camera;
 
 import android.util.Log;
+import android.widget.Toast;
+import com.android.camera.ui.RotateTextToast;
+import org.codeaurora.snapcam.R;
 
 public class CameraErrorCallback
         implements android.hardware.Camera.ErrorCallback {
     private static final String TAG = "CameraErrorCallback";
+    public CameraActivity mActivity = null;
+    //custom error code for thermal shutdown. This should be in sync
+    //with HAL.
+    private static final int THERMAL_SHUTDOWN = 50;
+
+    public void setActivity(CameraActivity activity) {
+        mActivity = activity;
+    }
 
     @Override
     public void onError(int error, android.hardware.Camera camera) {
         Log.e(TAG, "Got camera error callback. error=" + error);
-        if (error == android.hardware.Camera.CAMERA_ERROR_SERVER_DIED
-             || error == android.hardware.Camera.CAMERA_ERROR_UNKNOWN) {
-            // 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.");
+        // 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.
+        if (mActivity != null) {
+            final int resId;
+            switch (error) {
+                case android.hardware.Camera.CAMERA_ERROR_SERVER_DIED:
+                    resId = R.string.camera_server_died;
+                    break;
+                case THERMAL_SHUTDOWN:
+                    resId = R.string.camera_thermal_shutdown;
+                    break;
+                case android.hardware.Camera.CAMERA_ERROR_UNKNOWN:
+                default:
+                    resId = R.string.camera_unknown_error;
+                    break;
+            }
+            mActivity.runOnUiThread(new Runnable() {
+                public void run() {
+                     RotateTextToast.makeText(mActivity, resId, Toast.LENGTH_LONG).show();
+                     mActivity.finish();
+                }
+            });
+        } else {
+            throw new RuntimeException("Unknown error");
         }
     }
 }