Show dialog when camera device is not connected.

  bug:10726516

Change-Id: I3d3433d0b2eced54027b19910473fd55135d0e1c

1 files changed, 29 insertions, 0 deletions

diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index fe65c0290..3638aac9b 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -19,10 +19,12 @@ package com.android.camera;
 import android.animation.Animator;
 import android.app.ActionBar;
 import android.app.Activity;
+import android.app.AlertDialog;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.ContentResolver;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.ServiceConnection;
@@ -75,6 +77,8 @@ import com.android.camera.util.PhotoSphereHelper;
 import com.android.camera.util.PhotoSphereHelper.PanoramaViewHelper;
 import com.android.camera2.R;
 
+import static com.android.camera.CameraManager.CameraOpenErrorCallback;
+
 public class CameraActivity extends Activity
         implements ModuleSwitcher.ModuleSwitchListener {
 
@@ -203,6 +207,27 @@ public class CameraActivity extends Activity
         }
     };
 
+    private CameraOpenErrorCallback mCameraOpenErrorCallback =
+            new CameraOpenErrorCallback() {
+                @Override
+                public void onCameraDisabled(int cameraId) {
+                    CameraUtil.showErrorAndFinish(CameraActivity.this,
+                            R.string.camera_disabled);
+                }
+
+                @Override
+                public void onDeviceOpenFailure(int cameraId) {
+                    CameraUtil.showErrorAndFinish(CameraActivity.this,
+                            R.string.cannot_connect_camera);
+                }
+
+                @Override
+                public void onReconnectionFailure(CameraManager mgr) {
+                    CameraUtil.showErrorAndFinish(CameraActivity.this,
+                            R.string.cannot_connect_camera);
+                }
+            };
+
     // close activity when screen turns off
     private BroadcastReceiver mScreenOffReceiver = new BroadcastReceiver() {
         @Override
@@ -1254,4 +1279,8 @@ public class CameraActivity extends Activity
         return (mCurrentModule instanceof VideoModule) ?
                 ((VideoModule) mCurrentModule).isRecording() : false;
     }
+
+    public CameraOpenErrorCallback getCameraOpenErrorCallback() {
+        return mCameraOpenErrorCallback;
+    }
 }