commit 0c74819b76752f78803530fb8e4ad0958f0949ed
author Wu-cheng Li <wuchengli@google.com> Fri Feb 25 01:36:56 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 25 01:36:56 2011 -0800
tree 7a31309c0214ce3ddea15ec9d7d18f7dc5f16b8b
parent ee4d1a67085cb6f49801f2e726df58a87e988253
parent f9293e7d5057f54ec90423f55b78138d5729e30f

Merge "Improve camera getSupportedPreviewFormats javadoc."

core/java/android/hardware/Camera.java

diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java
index 958bf08..97f0e1b 100644
--- a/core/java/android/hardware/Camera.java
+++ b/core/java/android/hardware/Camera.java
@@ -1776,7 +1776,9 @@
         }
 
         /**
-         * Gets the supported preview formats.
+         * Gets the supported preview formats. {@link android.graphics.ImageFormat#NV21}
+         * is always supported. {@link android.graphics.ImageFormat#YV12}
+         * is always supported since API level 12.
          *
          * @return a list of supported preview formats. This method will always
          *         return a list with at least one element.