diff options
| author | Angus Kong <shkong@google.com> | 2013-09-16 14:25:35 -0700 |
|---|---|---|
| committer | Angus Kong <shkong@google.com> | 2013-09-17 14:50:53 -0700 |
| commit | 4f795b878843e59810ec1dca05b7cdb37b5614c5 (patch) | |
| tree | 24f810cea8691c797a69a1595c931de44cc4c5f0 /src/com/android/camera/CameraButtonIntentReceiver.java | |
| parent | 5bee41c6d727c730c7b10fba886862284a489257 (diff) | |
| download | android_packages_apps_Snap-4f795b878843e59810ec1dca05b7cdb37b5614c5.tar.gz android_packages_apps_Snap-4f795b878843e59810ec1dca05b7cdb37b5614c5.tar.bz2 android_packages_apps_Snap-4f795b878843e59810ec1dca05b7cdb37b5614c5.zip | |
Show dialog when camera device is not connected.
bug:10726516
Change-Id: I3d3433d0b2eced54027b19910473fd55135d0e1c
Diffstat (limited to 'src/com/android/camera/CameraButtonIntentReceiver.java')
| -rw-r--r-- | src/com/android/camera/CameraButtonIntentReceiver.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/camera/CameraButtonIntentReceiver.java b/src/com/android/camera/CameraButtonIntentReceiver.java index a65942d57..253105aca 100644 --- a/src/com/android/camera/CameraButtonIntentReceiver.java +++ b/src/com/android/camera/CameraButtonIntentReceiver.java @@ -38,7 +38,9 @@ public class CameraButtonIntentReceiver extends BroadcastReceiver { CameraHolder holder = CameraHolder.instance(); ComboPreferences pref = new ComboPreferences(context); int cameraId = CameraSettings.readPreferredCameraId(pref); - if (holder.tryOpen(cameraId) == null) return; + if (holder.tryOpen(null, cameraId, null) == null) { + return; + } // We are going to launch the camera, so hold the camera for later use holder.keep(); |