Messaging: Fix javadoc

Change-Id: Ia1b0a8fa9a5e74078a68a55ca1953b6f085521b1

src/com/android/messaging/sms/ApnsXmlProcessor.java

@@ -108,10 +108,7 @@ class ApnsXmlProcessor {
     /**
      * Move XML parser forward to next event type or the end of doc
      *
-     * @param eventType
      * @return The final event type we meet
-     * @throws XmlPullParserException
-     * @throws IOException
      */
     private int advanceToNextEvent(int eventType) throws XmlPullParserException, IOException {
         for (;;) {
@@ -226,8 +223,6 @@ class ApnsXmlProcessor {
      * Process one apn
      *
      * @param apnValues Where we store the parsed apn
-     * @throws IOException
-     * @throws XmlPullParserException
      */
     private void processApn(ContentValues apnValues) throws IOException, XmlPullParserException {
         Assert.notNull(apnValues);
@@ -272,8 +267,6 @@ class ApnsXmlProcessor {
     /**
      * Process one mms_config.
      *
-     * @throws IOException
-     * @throws XmlPullParserException
      */
     private void processMmsConfig()
             throws IOException, XmlPullParserException {
@@ -303,8 +296,6 @@ class ApnsXmlProcessor {
      * Process one mms_config key/value pair
      *
      * @param mccMnc The mcc and mnc of this mms_config
-     * @throws IOException
-     * @throws XmlPullParserException
      */
     private void processMmsConfigKeyValue(String mccMnc)
             throws IOException, XmlPullParserException {

src/com/android/messaging/sms/BugleApnSettingsLoader.java

@@ -39,13 +39,11 @@ import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.List;
 
-/**
+/*
  * APN loader for default SMS SIM
- *
  * This loader tries to load APNs from 3 sources in order:
- * 1. Gservices setting
- * 2. System APN table
- * 3. Local APN table
+ * 1. System APN table
+ * 2. Local APN table
  */
 public class BugleApnSettingsLoader implements ApnSettingsLoader {
     /**

src/com/android/messaging/sms/BugleCarrierConfigValuesLoader.java

@@ -29,7 +29,7 @@ import com.android.messaging.R;
 import com.android.messaging.util.LogUtil;
 import com.android.messaging.util.PhoneUtils;
 
-/**
+/*
  * Carrier configuration loader
  *
  * Loader tries to load from resources. If there is MMS API available, also

src/com/android/messaging/sms/DatabaseMessages.java

@@ -144,8 +144,6 @@ public class DatabaseMessages {
 
         /**
          * Load from a cursor of a query that returns the SMS to import
-         *
-         * @param cursor
          */
         private void load(final Cursor cursor) {
             mRowId = cursor.getLong(INDEX_ID);
@@ -166,9 +164,6 @@ public class DatabaseMessages {
         /**
          * Get a new SmsMessage by loading from the cursor of a query
          * that returns the SMS to import
-         *
-         * @param cursor
-         * @return
          */
         public static SmsMessage get(final Cursor cursor) {
             final SmsMessage msg = new SmsMessage();
@@ -335,8 +330,6 @@ public class DatabaseMessages {
 
         /**
          * Load from a cursor of a query that returns the MMS to import
-         *
-         * @param cursor
          */
         public void load(final Cursor cursor) {
             mRowId = cursor.getLong(INDEX_ID);
@@ -376,9 +369,6 @@ public class DatabaseMessages {
         /**
          * Get a new MmsMessage by loading from the cursor of a query
          * that returns the MMS to import
-         *
-         * @param cursor
-         * @return
          */
         public static MmsMessage get(final Cursor cursor) {
             final MmsMessage msg = new MmsMessage();
@@ -387,8 +377,6 @@ public class DatabaseMessages {
         }
         /**
          * Add a loaded MMS part
-         *
-         * @param part
          */
         public void addPart(final MmsPart part) {
             mParts.add(part);
@@ -572,8 +560,6 @@ public class DatabaseMessages {
 
         /**
          * Load from a cursor of a query that returns the MMS part to import
-         *
-         * @param cursor
          */
         public void load(final Cursor cursor, final boolean loadMedia) {
             mRowId = cursor.getLong(INDEX_ID);
@@ -745,9 +731,6 @@ public class DatabaseMessages {
         /**
          * Get an instance of the MMS part from the part table cursor
          *
-         * @param cursor
-         * @param loadMedia Whether to load the media file of the part
-         * @return
          */
         public static MmsPart get(final Cursor cursor, final boolean loadMedia) {
             final MmsPart part = new MmsPart();

src/com/android/messaging/sms/MmsSender.java

@@ -63,7 +63,6 @@ public class MmsSender {
      * @param context Context
      * @param messageUri The unique URI of the message for identifying it during sending
      * @param sendReq The SendReq PDU of the message
-     * @throws MmsFailureException
      */
     public static void sendMms(final Context context, final int subId, final Uri messageUri,
             final SendReq sendReq, final Bundle sentIntentExras) throws MmsFailureException {
@@ -84,8 +83,6 @@ public class MmsSender {
      * @param transactionId The transaction id of the MMS message
      * @param contentLocation The url of the MMS message
      * @param status The status to send with the NotifyRespInd
-     * @throws MmsFailureException
-     * @throws InvalidHeaderValueException
      */
     public static void sendNotifyResponseForMmsDownload(final Context context, final int subId,
             final byte[] transactionId, final String contentLocation, final int status)
@@ -111,8 +108,6 @@ public class MmsSender {
      * @param subId The SIM's subId we are currently using
      * @param transactionId The transaction id of the MMS message
      * @param contentLocation The url of the MMS message
-     * @throws MmsFailureException
-     * @throws InvalidHeaderValueException
      */
     public static void sendAcknowledgeForMmsDownload(final Context context, final int subId,
             final byte[] transactionId, final String contentLocation)
@@ -142,7 +137,6 @@ public class MmsSender {
      * @param pdu The PDU to send
      * @param responseImportant If the sending response is important. Responses to the
      * Sending of AcknowledgeInd and NotifyRespInd are not important.
-     * @throws MmsFailureException
      */
     private static void sendMms(final Context context, final int subId, final Uri messageUri,
             final String locationUrl, final GenericPdu pdu, final boolean responseImportant,
@@ -242,8 +236,6 @@ public class MmsSender {
      *
      * @param context Context
      * @param contentLocation The url of the MMS message
-     * @throws MmsFailureException
-     * @throws InvalidHeaderValueException
      */
     public static void downloadMms(final Context context, final int subId,
             final String contentLocation, Bundle extras) throws MmsFailureException,

src/com/android/messaging/sms/MmsUtils.java

@@ -1010,7 +1010,6 @@ public class MmsUtils {
     /**
      * Parse values from a received sms message
      *
-     * @param context
      * @param msgs The received sms message content
      * @param error The received sms error
      * @return Parsed values from the message
@@ -1085,7 +1084,6 @@ public class MmsUtils {
      * a null string. Otherwise it will return the original subject string.
      * @param resources So the function can grab string resources
      * @param subject the raw subject
-     * @return
      */
     public static String cleanseMmsSubject(final Resources resources, final String subject) {
         if (TextUtils.isEmpty(subject)) {
@@ -1153,10 +1151,6 @@ public class MmsUtils {
 
     /**
      * Update the status and date_sent column of sms message in telephony provider
-     *
-     * @param smsMessageUri
-     * @param status
-     * @param timeSentInMillis
      */
     public static void updateSmsStatusAndDateSent(final Uri smsMessageUri, final int status,
             final long timeSentInMillis) {
@@ -1272,9 +1266,6 @@ public class MmsUtils {
 
     /**
      * Get the (?,?,...) thing for the SQL IN operator by a count
-     *
-     * @param count
-     * @return
      */
     public static String getSqlInOperand(final int count) {
         if (count <= 0) {
@@ -1378,10 +1369,6 @@ public class MmsUtils {
 
     /**
      * Convert a Java String to byte array using a charset name
-     *
-     * @param string
-     * @param charsetName
-     * @return
      */
     public static byte[] stringToBytes(final String string, final String charsetName) {
         if (string == null) {
@@ -2103,7 +2090,6 @@ public class MmsUtils {
      * Create an MMS message with subject, text and image
      *
      * @return Both the M-Send.req and the M-Send.conf for processing in the caller
-     * @throws MmsException
      */
     private static SendReq createMmsSendReq(final Context context, final int subId,
             final String[] recipients, final MessageData message,