diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2011-06-17 13:09:40 +0800 |
|---|---|---|
| committer | Wu-cheng Li <wuchengli@google.com> | 2011-06-17 13:11:03 +0800 |
| commit | facc8ce116bd92f7ba7e8ecb76cbda3953260ef9 (patch) | |
| tree | 2f0c7ff1b561b4fc7a6e7d28ee7a1c6ec857b3c5 /core/java/android | |
| parent | ed2ea731e5d32de50f6349182cfcdfc823ac0fd6 (diff) | |
| download | frameworks_base-facc8ce116bd92f7ba7e8ecb76cbda3953260ef9.zip frameworks_base-facc8ce116bd92f7ba7e8ecb76cbda3953260ef9.tar.gz frameworks_base-facc8ce116bd92f7ba7e8ecb76cbda3953260ef9.tar.bz2 | |
Mention device policay manager in Camera.open javadoc.
bug:4185309
Change-Id: I733654a0be1953851dac7686c9c38e7af8f1d73a
Diffstat (limited to 'core/java/android')
| -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); |