Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am c7396025: Merge change 6084 into donut

Browse Source 
Merge commit 'c7396025e59524e7ef639fd86fc23123939ee91c'

* commit 'c7396025e59524e7ef639fd86fc23123939ee91c':
  Return CAMERA_ERROR_SERVER_DIED to camera app when camera service dies (bug 1956726)
This commit is contained in:
Android (Google) Code Review
2009-07-06 11:02:33 -07:00
committed by The Android Open Source Project
parent 1eebdc04f0 c7396025e5
commit fee47b699f
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/hardware/Camera.java
View File

@@ -371,7 +371,7 @@ public class Camera {
}
private native final void native_takePicture();
// These match the enum in libs/android_runtime/android_hardware_Camera.cpp
// These match the enum in include/ui/Camera.h
/** Unspecified camerar error. @see #ErrorCallback */
public static final int CAMERA_ERROR_UNKNOWN = 1;
/** Media server died. In this case, the application must release the