am c3bfa604: am b06c9a8c: Merge change 26579 into eclair

Merge commit 'c3bfa6048da74dd54f9147f6600ad0537cbe7bd6'

* commit 'c3bfa6048da74dd54f9147f6600ad0537cbe7bd6':
  add definition for Mms.TempStorage content uri and filename.

core/java/android/provider/Telephony.java

@@ -1481,6 +1481,21 @@ public final class Telephony {
             public static final String SENT_TIME = "sent_time";
         }
 
+        public static final class ScrapSpace {
+            /**
+             * The content:// style URL for this table
+             */
+            public static final Uri CONTENT_URI = Uri.parse("content://mms/scrapSpace");
+
+            /**
+             * This is the scrap file we use to store the media attachment when the user
+             * chooses to capture a photo to be attached (and could be used for other media types
+             * if necessary). We pass {#link@Uri} to the Camera app, which streams the captured
+             * image to the uri. Internally we write the media content to this file.
+             */
+            public static final String SCRAP_FILE_PATH = "/sdcard/mms/scrapSpace/file";
+        }
+
         public static final class Intents {
             private Intents() {
                 // Non-instantiatable.