Merge change 23607 into eclair

* changes: Reject (NAK) CDMA SMS with unknown teleservice ids.
2009-09-02 20:29:09 -07:00
parent 8f99b52484 7e207afd49
commit fb16e5ccdb
3 changed files with 31 additions and 16 deletions
--- a/core/java/android/provider/Telephony.java
+++ b/core/java/android/provider/Telephony.java
@@ -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";
    }
 }
-
-
-
-