am 8521dca6: am fb16e5cc: Merge change 23607 into eclair

Merge commit '8521dca69bb33a7f45c8233305618e540543b00d'

* commit '8521dca69bb33a7f45c8233305618e540543b00d':
  Reject (NAK) CDMA SMS with unknown teleservice ids.
This commit is contained in:
Tammo Spalink
2009-09-03 09:50:45 -07:00
committed by Android Git Automerger
3 changed files with 31 additions and 16 deletions

View File

@@ -489,6 +489,13 @@ public final class Telephony {
*/
public static final int RESULT_SMS_OUT_OF_MEMORY = 3;
/**
* Set by BroadcastReceiver. Indicates the message, while
* possibly valid, is of a format or encoding that is not
* supported.
*/
public static final int RESULT_SMS_UNSUPPORTED = 4;
/**
* Broadcast Action: A new text based SMS message has been received
* by the device. The intent will have the following extra
@@ -1696,7 +1703,3 @@ public final class Telephony {
public static final String EXTRA_SPN = "spn";
}
}