Merge change 22564 into eclair

* changes:
  Add an extra intent parameter for recording duration limit.

1 files changed, 6 insertions, 0 deletions

diff --git a/core/java/android/provider/MediaStore.java b/core/java/android/provider/MediaStore.java
index 21e5865fef70..49b5bb19087a 100644
--- a/core/java/android/provider/MediaStore.java
+++ b/core/java/android/provider/MediaStore.java
@@ -164,6 +164,12 @@ public final class MediaStore
     public final static String EXTRA_SIZE_LIMIT = "android.intent.extra.sizeLimit";
 
     /**
+     * Specify the maximum allowed recording duration in seconds.
+     * @hide
+     */
+    public final static String EXTRA_DURATION_LIMIT = "android.intent.extra.durationLimit";
+
+    /**
      * The name of the Intent-extra used to indicate a content resolver Uri to be used to
      * store the requested image or video.
      */