Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a89a770c authored by Amit Mahajan's avatar Amit Mahajan Committed by Automerger Merge Worker
Browse files

Merge "Remove dup result code descriptions" am: 19ffdb08 am: 649dcf3e am: 4ed77d37 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1163685

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic06ed2a0e6d594e4231885635ab19e85953d06ac
parents 3164ff66 4ed77d37

telephony/java/android/telephony/SmsManager.java

+27 −34
Original line number Diff line number Diff line
@@ -384,7 +384,6 @@ public final class SmsManager { 
     * where this operation may fail.

     * </p>

     *

     *

     * @param destinationAddress the address to send the message to

     * @param scAddress is the service center address or null to use

     *  the current default SMSC
@@ -397,7 +396,6 @@ public final class SmsManager { 
     *  <code>RESULT_ERROR_RADIO_OFF</code><br>

     *  <code>RESULT_ERROR_NULL_PDU</code><br>

     *  <code>RESULT_ERROR_NO_SERVICE</code><br>

     *  <code>RESULT_ERROR_NO_SERVICE</code><br>

     *  <code>RESULT_ERROR_LIMIT_EXCEEDED</code><br>

     *  <code>RESULT_ERROR_FDN_CHECK_FAILURE</code><br>

     *  <code>RESULT_ERROR_SHORT_CODE_NOT_ALLOWED</code><br>
@@ -514,7 +512,6 @@ public final class SmsManager { 
     *  <code>RESULT_ERROR_RADIO_OFF</code><br>

     *  <code>RESULT_ERROR_NULL_PDU</code><br>

     *  <code>RESULT_ERROR_NO_SERVICE</code><br>

     *  <code>RESULT_ERROR_NO_SERVICE</code><br>

     *  <code>RESULT_ERROR_LIMIT_EXCEEDED</code><br>

     *  <code>RESULT_ERROR_FDN_CHECK_FAILURE</code><br>

     *  <code>RESULT_ERROR_SHORT_CODE_NOT_ALLOWED</code><br>
@@ -903,7 +900,6 @@ public final class SmsManager { 
     * where this operation may fail.

     * </p>

     *

     *

     * @param destinationAddress the address to send the message to

     * @param scAddress is the service center address or null to use

     *  the current default SMSC
@@ -918,7 +914,6 @@ public final class SmsManager { 
     *  <code>RESULT_ERROR_RADIO_OFF</code><br>

     *  <code>RESULT_ERROR_NULL_PDU</code><br>

     *  <code>RESULT_ERROR_NO_SERVICE</code><br>

     *  <code>RESULT_ERROR_NO_SERVICE</code><br>

     *  <code>RESULT_ERROR_LIMIT_EXCEEDED</code><br>

     *  <code>RESULT_ERROR_FDN_CHECK_FAILURE</code><br>

     *  <code>RESULT_ERROR_SHORT_CODE_NOT_ALLOWED</code><br>
@@ -1163,7 +1158,7 @@ public final class SmsManager { 
     * boolean value {@code true}. See {@link #getDefault()} for more information on the conditions

     * where this operation may fail.

     * </p>



     *

     * @param destinationAddress the address to send the message to

     * @param scAddress is the service center address or null to use

     *  the current default SMSC
@@ -1178,7 +1173,6 @@ public final class SmsManager { 
     *  <code>RESULT_ERROR_RADIO_OFF</code><br>

     *  <code>RESULT_ERROR_NULL_PDU</code><br>

     *  <code>RESULT_ERROR_NO_SERVICE</code><br>

     *  <code>RESULT_ERROR_NO_SERVICE</code><br>

     *  <code>RESULT_ERROR_LIMIT_EXCEEDED</code><br>

     *  <code>RESULT_ERROR_FDN_CHECK_FAILURE</code><br>

     *  <code>RESULT_ERROR_SHORT_CODE_NOT_ALLOWED</code><br>
@@ -1380,7 +1374,6 @@ public final class SmsManager { 
     *  <code>RESULT_ERROR_RADIO_OFF</code><br>

     *  <code>RESULT_ERROR_NULL_PDU</code><br>

     *  <code>RESULT_ERROR_NO_SERVICE</code><br>

     *  <code>RESULT_ERROR_NO_SERVICE</code><br>

     *  <code>RESULT_ERROR_LIMIT_EXCEEDED</code><br>

     *  <code>RESULT_ERROR_FDN_CHECK_FAILURE</code><br>

     *  <code>RESULT_ERROR_SHORT_CODE_NOT_ALLOWED</code><br>