diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2011-06-17 00:18:21 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-17 00:18:21 -0700 |
| commit | 25b93adeae84e98a7af8d963b04776e4b755a32a (patch) | |
| tree | 5c5e04ff5c64299dac81059cecb7737859dc40bf /core/java | |
| parent | 84a1b9e1684b2b7ae46e4f8d2eeec42e26eb6070 (diff) | |
| parent | facc8ce116bd92f7ba7e8ecb76cbda3953260ef9 (diff) | |
| download | frameworks_base-25b93adeae84e98a7af8d963b04776e4b755a32a.zip frameworks_base-25b93adeae84e98a7af8d963b04776e4b755a32a.tar.gz frameworks_base-25b93adeae84e98a7af8d963b04776e4b755a32a.tar.bz2 | |
Merge "Mention device policay manager in Camera.open javadoc."
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/hardware/Camera.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java index 1df3108..338e6c8 100644 --- a/core/java/android/hardware/Camera.java +++ b/core/java/android/hardware/Camera.java @@ -216,7 +216,9 @@ public class Camera { * {@link #getNumberOfCameras()}-1. * @return a new Camera object, connected, locked and ready for use. * @throws RuntimeException if connection to the camera service fails (for - * example, if the camera is in use by another process). + * example, if the camera is in use by another process or device policy + * manager has disabled the camera). + * @see android.app.admin.DevicePolicyManager#getCameraDisabled(android.content.ComponentName) */ public static Camera open(int cameraId) { return new Camera(cameraId); |