summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Grace Kloba <klobag@google.com> 2010-01-27 14:11:13 -0800
committer Grace Kloba <klobag@google.com> 2010-01-28 09:19:10 -0800
commit679091849754c60bdde5670495c38493065fd308 (patch)
tree9c46ad0425892c6f9025625fa63b06035e7cbac5
parent0561f1175dcbcaa19059eb5bde09cc02f81da0b3 (diff)
Use a single EXTRA_HEADERS intent.
-rw-r--r--api/current.xml15
-rw-r--r--core/java/android/provider/Browser.java18
2 files changed, 5 insertions, 28 deletions
diff --git a/api/current.xml b/api/current.xml
index 830238580bec..f73d9da19ee6 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -120190,22 +120190,11 @@
visibility="public"
>
</field>
-<field name="EXTRA_HEADERS_KEY"
+<field name="EXTRA_HEADERS"
type="java.lang.String"
transient="false"
volatile="false"
- value="&quot;com.android.browser.headers_key&quot;"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="EXTRA_HEADERS_VALUE"
- type="java.lang.String"
- transient="false"
- volatile="false"
- value="&quot;com.android.browser.headers_value&quot;"
+ value="&quot;com.android.browser.headers&quot;"
static="true"
final="true"
deprecated="not deprecated"
diff --git a/core/java/android/provider/Browser.java b/core/java/android/provider/Browser.java
index ef43afe183df..0b1b16b1d5dc 100644
--- a/core/java/android/provider/Browser.java
+++ b/core/java/android/provider/Browser.java
@@ -79,25 +79,13 @@ public class Browser {
public static final String EXTRA_POST_DATA = "com.android.browser.post_data";
/**
- * The name of the extra data in the VIEW intent. The data is in the format
- * of String array. This should be paired with EXTRA_HEADERS_VALUE.
- * <p>
- * The keys will be combined with the values and sent in the HTTP request
+ * The name of the extra data in the VIEW intent. The data are key/value
+ * pairs in the format of Bundle. They will be sent in the HTTP request
* headers for the provided url. The keys can't be the standard HTTP headers
* as they are set by the WebView. The url's schema must be http(s).
* <p>
*/
- public static final String EXTRA_HEADERS_KEY = "com.android.browser.headers_key";
-
- /**
- * The name of the extra data in the VIEW intent. The data is in the format
- * of String array. This should be paired with EXTRA_HEADERS_KEY.
- * <p>
- * The values will be combined with the keys and sent in the HTTP request
- * headers for the provided url. The url's schema must be http(s).
- * <p>
- */
- public static final String EXTRA_HEADERS_VALUE = "com.android.browser.headers_value";
+ public static final String EXTRA_HEADERS = "com.android.browser.headers";
/* if you change column order you must also change indices
below */