diff options
| author | John Huang <jsh@android.com> | 2010-08-12 10:32:39 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-12 10:32:39 -0700 |
| commit | 81a81f02d6d1ec7527d62189b6708c1d17f4c5dd (patch) | |
| tree | e56297961c1a076769d4090aab6efe5e1a1da745 /core/java | |
| parent | e63cccf006166c03f542349908f1c0a7b4d2d9cc (diff) | |
| parent | edfe20c4bd04716420a47516959d7c0e3e0064f6 (diff) | |
| download | frameworks_base-81a81f02d6d1ec7527d62189b6708c1d17f4c5dd.zip frameworks_base-81a81f02d6d1ec7527d62189b6708c1d17f4c5dd.tar.gz frameworks_base-81a81f02d6d1ec7527d62189b6708c1d17f4c5dd.tar.bz2 | |
am edfe20c4: am c636b846: Merge "Enhance WspTypeDecoder to decode Content Type Parameters"
Merge commit 'edfe20c4bd04716420a47516959d7c0e3e0064f6'
* commit 'edfe20c4bd04716420a47516959d7c0e3e0064f6':
Enhance WspTypeDecoder to decode Content Type Parameters
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/provider/Telephony.java | 15 |
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<String,String>)</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 |