summaryrefslogtreecommitdiffstats
path: root/core/java/android/provider
diff options
context:
space:
mode:
authorDan Griffin <dan.griffin@wdsglobal.com>2010-01-27 15:21:25 +0000
committerDan Griffin <dan.griffin@wdsglobal.com>2010-08-02 17:44:04 +0800
commitc9790716f0c759d8bb197f4237a2901e5f561b5b (patch)
tree3a04897829b019a325adf303f22c994a38f878c8 /core/java/android/provider
parent4506c62abd5767d6d42a97e8e87793a1b3bcb625 (diff)
downloadframeworks_base-c9790716f0c759d8bb197f4237a2901e5f561b5b.zip
frameworks_base-c9790716f0c759d8bb197f4237a2901e5f561b5b.tar.gz
frameworks_base-c9790716f0c759d8bb197f4237a2901e5f561b5b.tar.bz2
Enhance WspTypeDecoder to decode Content Type Parameters
This patch enables WspTypeDecoder to correctly parse content type parameters as described in the Wap230 WSP specifications (wap-230-wsp-20010705-a section 8.4.2.24) which are then passed on as part of the WAP_PUSH intent notification. It also recognises all Well Known WSP Content types, and simplifies their retrieval (i.e. a well known content type will always be available through the WspTypeDecoder.getValueString() method). Change-Id: I0eb3f9ac287aa7cb53312777c4be54b1939fa857
Diffstat (limited to 'core/java/android/provider')
-rw-r--r--core/java/android/provider/Telephony.java15
1 files changed, 12 insertions, 3 deletions
diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java
index d271e93..fa5cd8b 100644
--- a/core/java/android/provider/Telephony.java
+++ b/core/java/android/provider/Telephony.java
@@ -562,15 +562,24 @@ public final class Telephony {
* values:</p>
*
* <ul>
- * <li><em>transactionId (Integer)</em> - The WAP transaction
- * ID</li>
+ * <li><em>transactionId (Integer)</em> - The WAP transaction ID</li>
* <li><em>pduType (Integer)</em> - The WAP PDU type</li>
* <li><em>header (byte[])</em> - The header of the message</li>
* <li><em>data (byte[])</em> - The data payload of the message</li>
+ * <li><em>contentTypeParameters (HashMap&lt;String,String&gt;)</em>
+ * - Any parameters associated with the content type
+ * (decoded from the WSP Content-Type header)</li>
* </ul>
*
* <p>If a BroadcastReceiver encounters an error while processing
* this intent it should set the result code appropriately.</p>
+ *
+ * <p>The contentTypeParameters extra value is map of content parameters keyed by
+ * their names.</p>
+ *
+ * <p>If any unassigned well-known parameters are encountered, the key of the map will
+ * be 'unassigned/0x...', where '...' is the hex value of the unassigned parameter. If
+ * a parameter has No-Value the value in the map will be null.</p>
*/
@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
public static final String WAP_PUSH_RECEIVED_ACTION =
@@ -583,7 +592,7 @@ public final class Telephony {
*/
@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
public static final String SIM_FULL_ACTION =
- "android.provider.Telephony.SIM_FULL";
+ "android.provider.Telephony.SIM_FULL";
/**
* Broadcast Action: An incoming SMS has been rejected by the