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

Commit 4ed77d37 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 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibd1c4cab0ad8ece17e732e78b8cd83d2780ad0ee
parents ff5d180d 649dcf3e

telephony/java/android/telephony/SmsManager.java

+27 −34
Original line number Diff line number Diff line
@@ -345,7 +345,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
@@ -358,7 +357,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>
@@ -473,7 +471,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>
@@ -862,7 +859,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
@@ -877,7 +873,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>
@@ -1123,7 +1118,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
@@ -1138,7 +1133,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>
@@ -1340,7 +1334,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>