Cleanup comments, see bug 2401350.

Change-Id: Ieaeeba44b235038ad9b75a57b37658738532df3f

6 files changed, 6 insertions, 16 deletions

diff --git a/telephony/java/com/android/internal/telephony/Phone.java b/telephony/java/com/android/internal/telephony/Phone.java
index 3adad6f712e5..7179bef9f165 100644
--- a/telephony/java/com/android/internal/telephony/Phone.java
+++ b/telephony/java/com/android/internal/telephony/Phone.java
@@ -1399,11 +1399,6 @@ public interface Phone {
 
     /* CDMA support methods */
 
-    /*
-     * TODO(Moto) TODO(Teleca): can getCdmaMin, getEsn, getMeid use more generic calls
-     * already defined getXxxx above?
-     */
-
     /**
      * Retrieves the MIN for CDMA phones.
      */
diff --git a/telephony/java/com/android/internal/telephony/RIL.java b/telephony/java/com/android/internal/telephony/RIL.java
index 2a7004d5ea6d..d8e313a79908 100644
--- a/telephony/java/com/android/internal/telephony/RIL.java
+++ b/telephony/java/com/android/internal/telephony/RIL.java
@@ -2982,10 +2982,9 @@ public final class RIL extends BaseCommands implements CommandsInterface {
         numServiceCategories = p.readInt();
 
         if (numServiceCategories == 0) {
-            // TODO(Teleca) TODO(Moto): The logic of providing default
-            // values should not be done by this transport layer. And
-            // needs to be done by the vendor ril or application logic.
-            // TODO(Google): Remove ASAP
+            // TODO: The logic of providing default values should
+            // not be done by this transport layer. And needs to
+            // be done by the vendor ril or application logic.
             int numInts;
             numInts = CDMA_BROADCAST_SMS_NO_OF_SERVICE_CATEGORIES * CDMA_BSI_NO_OF_INTS_STRUCT + 1;
             response = new int[numInts];
diff --git a/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java b/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java
index d4b1652e6a7c..1f5accf38f21 100755
--- a/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java
+++ b/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java
@@ -681,7 +681,7 @@ public class CDMAPhone extends PhoneBase {
     public String getVoiceMailNumber() {
         String number = null;
         SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getContext());
-        // TODO(Moto): The default value of voicemail number should be read from a system property
+        // TODO: The default value of voicemail number should be read from a system property
         number = sp.getString(VM_NUMBER_CDMA, "*86");
         return number;
     }
diff --git a/telephony/java/com/android/internal/telephony/cdma/CdmaInformationRecords.java b/telephony/java/com/android/internal/telephony/cdma/CdmaInformationRecords.java
index 7402769cee40..ce6530af8ce6 100644
--- a/telephony/java/com/android/internal/telephony/cdma/CdmaInformationRecords.java
+++ b/telephony/java/com/android/internal/telephony/cdma/CdmaInformationRecords.java
@@ -74,7 +74,7 @@ public final class CdmaInformationRecords {
                 break;
 
             case RIL_CDMA_T53_RELEASE_INFO_REC:
-                // TODO(Moto): WHAT to do, for now fall through and throw exception
+                // TODO: WHAT to do, for now fall through and throw exception
             default:
                 throw new RuntimeException("RIL_UNSOL_CDMA_INFO_REC: unsupported record. Got "
                                             + CdmaInformationRecords.idToString(id) + " ");
diff --git a/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java b/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
index 42feaa904b10..7f2ba47c44ff 100644
--- a/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
+++ b/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
@@ -1622,9 +1622,7 @@ final class CdmaServiceStateTracker extends ServiceStateTracker {
      * Returns IMSI as MCC + MNC + MIN
      */
     String getImsi() {
-        // TODO(Moto): When RUIM is enabled, IMSI will come from RUIM
-        // not build-time props. Moto will provide implementation
-        // for RUIM-ready case later.
+        // TODO: When RUIM is enabled, IMSI will come from RUIM not build-time props.
         String operatorNumeric = SystemProperties.get(
                 TelephonyProperties.PROPERTY_ICC_OPERATOR_NUMERIC, "");
 
diff --git a/telephony/java/com/android/internal/telephony/cdma/RuimRecords.java b/telephony/java/com/android/internal/telephony/cdma/RuimRecords.java
index b9ece8b965ee..87b0c6060cd2 100644
--- a/telephony/java/com/android/internal/telephony/cdma/RuimRecords.java
+++ b/telephony/java/com/android/internal/telephony/cdma/RuimRecords.java
@@ -166,10 +166,8 @@ public final class RuimRecords extends IccRecords {
             return null;
         }
 
-        // TODO(Moto): mncLength is not set anywhere.
         if (mncLength != UNINITIALIZED && mncLength != UNKNOWN) {
             // Length = length of MCC + length of MNC
-            // TODO: change spec name
             // length of mcc = 3 (3GPP2 C.S0005 - Section 2.3)
             return mImsi.substring(0, 3 + mncLength);
         }