diff --git a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java index 9271caf0b7219..4553e9e0dfe65 100644 --- a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java +++ b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java @@ -478,7 +478,7 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { private Intent putPhoneInfo(Intent intent, Bundle data, Boolean simInited) { int subscription = simInited - ? 1/* mock subid=1 */ : SubscriptionManager.DUMMY_SUBSCRIPTION_ID_BASE; + ? 1/* mock subid=1 */ : SubscriptionManager.PLACEHOLDER_SUBSCRIPTION_ID_BASE; if (data != null) intent.putExtras(data); intent.putExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX, subscription); diff --git a/services/core/java/com/android/server/TelephonyRegistry.java b/services/core/java/com/android/server/TelephonyRegistry.java index 82ce7b1002e36..c7277de184421 100644 --- a/services/core/java/com/android/server/TelephonyRegistry.java +++ b/services/core/java/com/android/server/TelephonyRegistry.java @@ -111,11 +111,11 @@ import java.util.NoSuchElementException; * Change-Id: I450c968bda93767554b5188ee63e10c9f43c5aa4 fixes bugs 16148026 * and 15973975 by saving the phoneId of the registrant and then using the * phoneId when deciding to to make a callback. This is necessary because - * a subId changes from to a dummy value when a SIM is removed and thus won't + * a subId changes from to a placeholder value when a SIM is removed and thus won't * compare properly. Because getPhoneIdFromSubId(int subId) handles - * the dummy value conversion we properly do the callbacks. + * the placeholder value conversion we properly do the callbacks. * - * Eventually we may want to remove the notion of dummy value but for now this + * Eventually we may want to remove the notion of placeholder value but for now this * looks like the best approach. */ @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE) diff --git a/telecomm/java/android/telecom/Call.java b/telecomm/java/android/telecom/Call.java index 8b894126234f3..4b9a9abac88fc 100755 --- a/telecomm/java/android/telecom/Call.java +++ b/telecomm/java/android/telecom/Call.java @@ -469,7 +469,7 @@ public final class Call { /** * When set for a call, indicates that this {@code Call} can be transferred to another * number. - * Call supports the blind and assured call transfer feature. + * Call supports the confirmed and unconfirmed call transfer feature. * * @hide */ @@ -1595,8 +1595,8 @@ public final class Call { * Instructs this {@code Call} to be transferred to another number. * * @param targetNumber The address to which the call will be transferred. - * @param isConfirmationRequired if {@code true} it will initiate ASSURED transfer, - * if {@code false}, it will initiate BLIND transfer. + * @param isConfirmationRequired if {@code true} it will initiate a confirmed transfer, + * if {@code false}, it will initiate an unconfirmed transfer. * * @hide */ diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java index b35452146e72a..90beae8326ef0 100755 --- a/telecomm/java/android/telecom/Connection.java +++ b/telecomm/java/android/telecom/Connection.java @@ -393,7 +393,7 @@ public abstract class Connection extends Conferenceable { /** * Indicates that this {@code Connection} can be transferred to another * number. - * Connection supports the blind and assured call transfer feature. + * Connection supports the confirmed and unconfirmed call transfer feature. * @hide */ public static final int CAPABILITY_TRANSFER = 0x08000000; diff --git a/telecomm/java/android/telecom/ConnectionService.java b/telecomm/java/android/telecom/ConnectionService.java index 95c238e041152..8bc80adf80a8c 100755 --- a/telecomm/java/android/telecom/ConnectionService.java +++ b/telecomm/java/android/telecom/ConnectionService.java @@ -1864,6 +1864,7 @@ public abstract class ConnectionService extends Service { } mConferenceById.put(callId, conference); mIdByConference.put(conference, callId); + conference.addListener(mConferenceListener); ParcelableConference parcelableConference = new ParcelableConference.Builder( request.getAccountHandle(), conference.getState()) diff --git a/telecomm/java/android/telecom/InCallAdapter.java b/telecomm/java/android/telecom/InCallAdapter.java index dd6c153116510..ab35affe9099c 100755 --- a/telecomm/java/android/telecom/InCallAdapter.java +++ b/telecomm/java/android/telecom/InCallAdapter.java @@ -107,8 +107,8 @@ public final class InCallAdapter { * * @param callId The identifier of the call to transfer. * @param targetNumber The address to transfer to. - * @param isConfirmationRequired if {@code true} it will initiate ASSURED transfer, - * if {@code false}, it will initiate BLIND transfer. + * @param isConfirmationRequired if {@code true} it will initiate a confirmed transfer, + * if {@code false}, it will initiate unconfirmed transfer. */ public void transferCall(@NonNull String callId, @NonNull Uri targetNumber, boolean isConfirmationRequired) { diff --git a/telephony/common/android/telephony/LocationAccessPolicy.java b/telephony/common/android/telephony/LocationAccessPolicy.java index b1dc1da762722..892e55942d3fa 100644 --- a/telephony/common/android/telephony/LocationAccessPolicy.java +++ b/telephony/common/android/telephony/LocationAccessPolicy.java @@ -51,7 +51,7 @@ public final class LocationAccessPolicy { ALLOWED, /** * Indicates that the denial is due to a transient device state - * (e.g. app-ops, location master switch) + * (e.g. app-ops, location main switch) */ DENIED_SOFT, /** @@ -259,7 +259,7 @@ public final class LocationAccessPolicy { return LocationPermissionResult.ALLOWED; } - // Check the system-wide requirements. If the location master switch is off or + // Check the system-wide requirements. If the location main switch is off or // the app's profile isn't in foreground, return a soft denial. if (!checkSystemLocationAccess(context, query.callingUid, query.callingPid)) { return LocationPermissionResult.DENIED_SOFT; @@ -283,7 +283,7 @@ public final class LocationAccessPolicy { } // At this point, we're out of location checks to do. If the app bypassed all the previous - // ones due to the SDK grandfathering schemes, allow it access. + // ones due to the SDK backwards compatibility schemes, allow it access. return LocationPermissionResult.ALLOWED; } diff --git a/telephony/common/com/android/internal/telephony/TelephonyPermissions.java b/telephony/common/com/android/internal/telephony/TelephonyPermissions.java index a1398e3b6207a..82725032eb44c 100644 --- a/telephony/common/com/android/internal/telephony/TelephonyPermissions.java +++ b/telephony/common/com/android/internal/telephony/TelephonyPermissions.java @@ -75,7 +75,8 @@ public final class TelephonyPermissions { *
  • return false: if the caller lacks all of these permissions and doesn't support runtime * permissions. This implies that the user revoked the ability to read phone state * manually (via AppOps). In this case we can't throw as it would break app compatibility, - * so we return false to indicate that the calling function should return dummy data. + * so we return false to indicate that the calling function should return placeholder + * data. * * *

    Note: for simplicity, this method always returns false for callers using legacy @@ -120,7 +121,8 @@ public final class TelephonyPermissions { *

  • return false: if the caller lacks all of these permissions and doesn't support runtime * permissions. This implies that the user revoked the ability to read phone state * manually (via AppOps). In this case we can't throw as it would break app compatibility, - * so we return false to indicate that the calling function should return dummy data. + * so we return false to indicate that the calling function should return placeholder + * data. * * *

    Note: for simplicity, this method always returns false for callers using legacy @@ -226,7 +228,7 @@ public final class TelephonyPermissions { *

  • return false: if the caller is targeting pre-Q and does have the READ_PHONE_STATE * permission. In this case the caller would expect to have access to the device * identifiers so false is returned instead of throwing a SecurityException to indicate - * the calling function should return dummy data. + * the calling function should return placeholder data. * */ public static boolean checkCallingOrSelfReadDeviceIdentifiers(Context context, @@ -250,7 +252,7 @@ public final class TelephonyPermissions { *
  • return false: if the caller is targeting pre-Q and does have the READ_PHONE_STATE * permission or carrier privileges. In this case the caller would expect to have access * to the device identifiers so false is returned instead of throwing a SecurityException - * to indicate the calling function should return dummy data. + * to indicate the calling function should return placeholder data. * */ public static boolean checkCallingOrSelfReadDeviceIdentifiers(Context context, int subId, @@ -272,7 +274,7 @@ public final class TelephonyPermissions { *
  • return false: if the caller is targeting pre-Q and does have the READ_PHONE_STATE * permission. In this case the caller would expect to have access to the device * identifiers so false is returned instead of throwing a SecurityException to indicate - * the calling function should return dummy data. + * the calling function should return placeholder data. * */ public static boolean checkCallingOrSelfReadSubscriberIdentifiers(Context context, int subId, @@ -296,7 +298,7 @@ public final class TelephonyPermissions { *
  • return false: if the caller is targeting pre-Q and does have the READ_PHONE_STATE * permission. In this case the caller would expect to have access to the device * identifiers so false is returned instead of throwing a SecurityException to indicate - * the calling function should return dummy data. + * the calling function should return placeholder data. * */ private static boolean checkPrivilegedReadPermissionOrCarrierPrivilegePermission( diff --git a/telephony/common/com/google/android/mms/pdu/PduComposer.java b/telephony/common/com/google/android/mms/pdu/PduComposer.java index 5e1f556f4c4aa..7af0d1b09eed0 100644 --- a/telephony/common/com/google/android/mms/pdu/PduComposer.java +++ b/telephony/common/com/google/android/mms/pdu/PduComposer.java @@ -1051,7 +1051,7 @@ public class PduComposer { } if (dataLength != (attachment.getLength() - headerLength)) { - throw new RuntimeException("BUG: Length sanity check failed"); + throw new RuntimeException("BUG: Length correctness check failed"); } mStack.pop(); diff --git a/telephony/common/com/google/android/mms/pdu/PduPersister.java b/telephony/common/com/google/android/mms/pdu/PduPersister.java index fcd5b8ff57a8d..b61ad3680c6cc 100755 --- a/telephony/common/com/google/android/mms/pdu/PduPersister.java +++ b/telephony/common/com/google/android/mms/pdu/PduPersister.java @@ -72,7 +72,7 @@ public class PduPersister { private static final boolean DEBUG = false; private static final boolean LOCAL_LOGV = false; - private static final long DUMMY_THREAD_ID = Long.MAX_VALUE; + private static final long PLACEHOLDER_THREAD_ID = Long.MAX_VALUE; /** * The uri of temporary drm objects. @@ -1340,7 +1340,7 @@ public class PduPersister { // Save parts first to avoid inconsistent message is loaded // while saving the parts. - long dummyId = System.currentTimeMillis(); // Dummy ID of the msg. + long placeholderId = System.currentTimeMillis(); // Placeholder ID of the msg. // Figure out if this PDU is a text-only message boolean textOnly = true; @@ -1364,7 +1364,7 @@ public class PduPersister { for (int i = 0; i < partsNum; i++) { PduPart part = body.getPart(i); messageSize += part.getDataLength(); - persistPart(part, dummyId, preOpenedFiles); + persistPart(part, placeholderId, preOpenedFiles); // If we've got anything besides text/plain or SMIL part, then we've got // an mms message with some other type of attachment. @@ -1395,14 +1395,14 @@ public class PduPersister { throw new MmsException("persist() failed: return null."); } // Get the real ID of the PDU and update all parts which were - // saved with the dummy ID. + // saved with the placeholder ID. msgId = ContentUris.parseId(res); } values = new ContentValues(1); values.put(Part.MSG_ID, msgId); SqliteWrapper.update(mContext, mContentResolver, - Uri.parse("content://mms/" + dummyId + "/part"), + Uri.parse("content://mms/" + placeholderId + "/part"), values, null, null); // We should return the longest URI of the persisted PDU, for // example, if input URI is "content://mms/inbox" and the _ID of diff --git a/telephony/java/android/telephony/MbmsDownloadSession.java b/telephony/java/android/telephony/MbmsDownloadSession.java index 3f671ca2d8095..18d6f467ba7b3 100644 --- a/telephony/java/android/telephony/MbmsDownloadSession.java +++ b/telephony/java/android/telephony/MbmsDownloadSession.java @@ -509,7 +509,7 @@ public class MbmsDownloadSession implements AutoCloseable { * provided directory is the same as what has been previously configured. * * The {@link File} supplied as a root temp file directory must already exist. If not, an - * {@link IllegalArgumentException} will be thrown. In addition, as an additional sanity + * {@link IllegalArgumentException} will be thrown. In addition, as an additional correctness * check, an {@link IllegalArgumentException} will be thrown if you attempt to set the temp * file root directory to one of your data roots (the value of {@link Context#getDataDir()}, * {@link Context#getFilesDir()}, or {@link Context#getCacheDir()}). diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java index 7f2c6c17d5086..5082e65df80bc 100644 --- a/telephony/java/android/telephony/SubscriptionManager.java +++ b/telephony/java/android/telephony/SubscriptionManager.java @@ -95,10 +95,9 @@ public class SubscriptionManager { /** An invalid subscription identifier */ public static final int INVALID_SUBSCRIPTION_ID = -1; - /** Base value for Dummy SUBSCRIPTION_ID's. */ - /** FIXME: Remove DummySubId's, but for now have them map just below INVALID_SUBSCRIPTION_ID - /** @hide */ - public static final int DUMMY_SUBSCRIPTION_ID_BASE = INVALID_SUBSCRIPTION_ID - 1; + /** Base value for placeholder SUBSCRIPTION_ID's. */ + /** @hide */ + public static final int PLACEHOLDER_SUBSCRIPTION_ID_BASE = INVALID_SUBSCRIPTION_ID - 1; /** An invalid phone identifier */ /** @hide */ diff --git a/telephony/java/android/telephony/VisualVoicemailSmsFilterSettings.java b/telephony/java/android/telephony/VisualVoicemailSmsFilterSettings.java index e8f3f1ebb6cf3..eadb726bf63b7 100644 --- a/telephony/java/android/telephony/VisualVoicemailSmsFilterSettings.java +++ b/telephony/java/android/telephony/VisualVoicemailSmsFilterSettings.java @@ -92,8 +92,8 @@ public final class VisualVoicemailSmsFilterSettings implements Parcelable { } /** - * Sets the originating number whitelist for the visual voicemail SMS filter. If the list is - * not null only the SMS messages from a number in the list can be considered as a visual + * Sets the originating number allow list for the visual voicemail SMS filter. If the list + * is not null only the SMS messages from a number in the list can be considered as a visual * voicemail SMS. Otherwise, messages from any address will be considered. */ public Builder setOriginatingNumbers(List originatingNumbers) { @@ -133,7 +133,7 @@ public final class VisualVoicemailSmsFilterSettings implements Parcelable { public final String clientPrefix; /** - * The originating number whitelist for the visual voicemail SMS filter of a phone account. If + * The originating number allow list for the visual voicemail SMS filter of a phone account. If * the list is not null only the SMS messages from a number in the list can be considered as a * visual voicemail SMS. Otherwise, messages from any address will be considered. */ diff --git a/telephony/java/android/telephony/data/ApnSetting.java b/telephony/java/android/telephony/data/ApnSetting.java index 158ada94e3c66..d44d29f3aefba 100644 --- a/telephony/java/android/telephony/data/ApnSetting.java +++ b/telephony/java/android/telephony/data/ApnSetting.java @@ -1640,7 +1640,7 @@ public class ApnSetting implements Parcelable { * * 
    
      * // Create an MMS proxy address with a hostname. A network might not be
-     * // available, so supply a dummy (0.0.0.0) IPv4 address to avoid DNS lookup.
+     * // available, so supply a placeholder (0.0.0.0) IPv4 address to avoid DNS lookup.
      * String host = "mms.example.com";
      * byte[] ipAddress = new byte[4];
      * InetAddress mmsProxy;
@@ -1825,7 +1825,8 @@ public class ApnSetting implements Parcelable {
          * {@link java.net.InetAddress#getAllByName getAllByName()} require DNS for hostname
          * resolution. To avoid this requirement when setting a hostname, call
          * {@link java.net.InetAddress#getByAddress(java.lang.String, byte[])} with both the
-         * hostname and a dummy IP address. See {@link ApnSetting.Builder above} for an example.
+         * hostname and a placeholder IP address. See {@link ApnSetting.Builder above} for an
+         * example.
          *
          * @param proxy the proxy address to set for the APN
          * @deprecated use {@link #setProxyAddress(String)} instead.
@@ -1879,7 +1880,8 @@ public class ApnSetting implements Parcelable {
          * {@link java.net.InetAddress#getAllByName getAllByName()} require DNS for hostname
          * resolution. To avoid this requirement when setting a hostname, call
          * {@link java.net.InetAddress#getByAddress(java.lang.String, byte[])} with both the
-         * hostname and a dummy IP address. See {@link ApnSetting.Builder above} for an example.
+         * hostname and a placeholder IP address. See {@link ApnSetting.Builder above} for an
+         * example.
          *
          * @param mmsProxy the MMS proxy address to set for the APN
          * @deprecated use {@link #setMmsProxyAddress(String)} instead.
diff --git a/telephony/java/android/telephony/ims/ImsCallSession.java b/telephony/java/android/telephony/ims/ImsCallSession.java
index 80c38cbfc39ad..8857b9b36d0c4 100755
--- a/telephony/java/android/telephony/ims/ImsCallSession.java
+++ b/telephony/java/android/telephony/ims/ImsCallSession.java
@@ -815,7 +815,7 @@ public class ImsCallSession {
      * Transfers an ongoing call.
      *
      * @param number number to be transferred to.
-     * @param isConfirmationRequired indicates blind or assured transfer.
+     * @param isConfirmationRequired indicates whether confirmation of the transfer is required.
      */
     public void transfer(@NonNull String number, boolean isConfirmationRequired) {
         if (mClosed) {
diff --git a/telephony/java/android/telephony/ims/compat/stub/ImsConfigImplBase.java b/telephony/java/android/telephony/ims/compat/stub/ImsConfigImplBase.java
index aae6f9214c70f..0c7264697cd31 100644
--- a/telephony/java/android/telephony/ims/compat/stub/ImsConfigImplBase.java
+++ b/telephony/java/android/telephony/ims/compat/stub/ImsConfigImplBase.java
@@ -89,7 +89,7 @@ public class ImsConfigImplBase {
     /**
      * Sets the value for IMS service/capabilities parameters by the operator device
      * management entity. It sets the config item value in the provisioned storage
-     * from which the master value is derived. Synchronous blocking call.
+     * from which the main value is derived. Synchronous blocking call.
      *
      * @param item, as defined in com.android.ims.ImsConfig#ConfigConstants.
      * @param value in Integer format.
@@ -102,7 +102,7 @@ public class ImsConfigImplBase {
     /**
      * Sets the value for IMS service/capabilities parameters by the operator device
      * management entity. It sets the config item value in the provisioned storage
-     * from which the master value is derived.  Synchronous blocking call.
+     * from which the main value is derived.  Synchronous blocking call.
      *
      * @param item as defined in com.android.ims.ImsConfig#ConfigConstants.
      * @param value in String format.
@@ -114,7 +114,7 @@ public class ImsConfigImplBase {
 
     /**
      * Gets the value of the specified IMS feature item for specified network type.
-     * This operation gets the feature config value from the master storage (i.e. final
+     * This operation gets the feature config value from the main storage (i.e. final
      * value). Asynchronous non-blocking call.
      *
      * @param feature as defined in com.android.ims.ImsConfig#FeatureConstants.
@@ -127,7 +127,7 @@ public class ImsConfigImplBase {
 
     /**
      * Sets the value for IMS feature item for specified network type.
-     * This operation stores the user setting in setting db from which master db
+     * This operation stores the user setting in setting db from which main db
      * is derived.
      *
      * @param feature as defined in com.android.ims.ImsConfig#FeatureConstants.
@@ -268,7 +268,7 @@ public class ImsConfigImplBase {
         /**
          * Sets the value for IMS service/capabilities parameters by the operator device
          * management entity. It sets the config item value in the provisioned storage
-         * from which the master value is derived, and write it into local cache.
+         * from which the main value is derived, and write it into local cache.
          * Synchronous blocking call.
          *
          * @param item, as defined in com.android.ims.ImsConfig#ConfigConstants.
@@ -292,7 +292,7 @@ public class ImsConfigImplBase {
         /**
          * Sets the value for IMS service/capabilities parameters by the operator device
          * management entity. It sets the config item value in the provisioned storage
-         * from which the master value is derived, and write it into local cache.
+         * from which the main value is derived, and write it into local cache.
          * Synchronous blocking call.
          *
          * @param item as defined in com.android.ims.ImsConfig#ConfigConstants.
diff --git a/telephony/java/android/telephony/ims/stub/ImsCallSessionImplBase.java b/telephony/java/android/telephony/ims/stub/ImsCallSessionImplBase.java
index 73ba0e393e784..8f738d216cbea 100644
--- a/telephony/java/android/telephony/ims/stub/ImsCallSessionImplBase.java
+++ b/telephony/java/android/telephony/ims/stub/ImsCallSessionImplBase.java
@@ -439,8 +439,8 @@ public class ImsCallSessionImplBase implements AutoCloseable {
      * Transfer an established call to given number
      *
      * @param number number to transfer the call
-     * @param isConfirmationRequired if {@code True}, indicates Assured transfer,
-     * if {@code False} it indicates Blind transfer.
+     * @param isConfirmationRequired if {@code True}, indicates a confirmed transfer,
+     * if {@code False} it indicates an unconfirmed transfer.
      * @hide
      */
     public void transfer(@NonNull String number, boolean isConfirmationRequired) {
diff --git a/telephony/java/android/telephony/ims/stub/ImsConfigImplBase.java b/telephony/java/android/telephony/ims/stub/ImsConfigImplBase.java
index 6a2638bc72216..4ef44d3ec9ef5 100644
--- a/telephony/java/android/telephony/ims/stub/ImsConfigImplBase.java
+++ b/telephony/java/android/telephony/ims/stub/ImsConfigImplBase.java
@@ -142,7 +142,7 @@ public class ImsConfigImplBase {
         /**
          * Sets the value for IMS service/capabilities parameters by the operator device
          * management entity. It sets the config item value in the provisioned storage
-         * from which the master value is derived, and write it into local cache.
+         * from which the main value is derived, and write it into local cache.
          * Synchronous blocking call.
          *
          * @param item integer key
@@ -167,7 +167,7 @@ public class ImsConfigImplBase {
         /**
          * Sets the value for IMS service/capabilities parameters by the operator device
          * management entity. It sets the config item value in the provisioned storage
-         * from which the master value is derived, and write it into local cache.
+         * from which the main value is derived, and write it into local cache.
          * Synchronous blocking call.
          *
          * @param item as defined in com.android.ims.ImsConfig#ConfigConstants.
diff --git a/telephony/java/android/telephony/mbms/MbmsTempFileProvider.java b/telephony/java/android/telephony/mbms/MbmsTempFileProvider.java
index 689becd7169a7..17adede86c515 100644
--- a/telephony/java/android/telephony/mbms/MbmsTempFileProvider.java
+++ b/telephony/java/android/telephony/mbms/MbmsTempFileProvider.java
@@ -91,7 +91,7 @@ public class MbmsTempFileProvider extends ContentProvider {
     public void attachInfo(Context context, ProviderInfo info) {
         super.attachInfo(context, info);
 
-        // Sanity check our security
+        // Correctness check our security
         if (info.exported) {
             throw new SecurityException("Provider must not be exported");
         }
diff --git a/telephony/java/com/android/ims/internal/IImsCallSession.aidl b/telephony/java/com/android/ims/internal/IImsCallSession.aidl
index 0466efc2f6c6a..ab14e82b70877 100644
--- a/telephony/java/com/android/ims/internal/IImsCallSession.aidl
+++ b/telephony/java/com/android/ims/internal/IImsCallSession.aidl
@@ -153,8 +153,8 @@ interface IImsCallSession {
      * Transfer an established call to given number
      *
      * @param number number to transfer the call
-     * @param isConfirmationRequired if {@code True}, indicates Assured transfer,
-     * if {@code False} it indicates Blind transfer.
+     * @param isConfirmationRequired if {@code True}, indicates a confirmed transfer,
+     * if {@code False} it indicates an unconfirmed transfer.
      */
     void transfer(String number, boolean isConfirmationRequired);
 
diff --git a/telephony/java/com/android/ims/internal/IImsConfig.aidl b/telephony/java/com/android/ims/internal/IImsConfig.aidl
index 7324814ae5a41..1a14e8780664b 100644
--- a/telephony/java/com/android/ims/internal/IImsConfig.aidl
+++ b/telephony/java/com/android/ims/internal/IImsConfig.aidl
@@ -49,7 +49,7 @@ interface IImsConfig {
     /**
      * Sets the value for IMS service/capabilities parameters by the operator device
      * management entity. It sets the config item value in the provisioned storage
-     * from which the master value is derived. Synchronous blocking call.
+     * from which the main value is derived. Synchronous blocking call.
      *
      * @param item, as defined in com.android.ims.ImsConfig#ConfigConstants.
      * @param value in Integer format.
@@ -60,7 +60,7 @@ interface IImsConfig {
     /**
      * Sets the value for IMS service/capabilities parameters by the operator device
      * management entity. It sets the config item value in the provisioned storage
-     * from which the master value is derived.  Synchronous blocking call.
+     * from which the main value is derived.  Synchronous blocking call.
      *
      * @param item, as defined in com.android.ims.ImsConfig#ConfigConstants.
      * @param value in String format.
@@ -70,7 +70,7 @@ interface IImsConfig {
 
     /**
      * Gets the value of the specified IMS feature item for specified network type.
-     * This operation gets the feature config value from the master storage (i.e. final
+     * This operation gets the feature config value from the main storage (i.e. final
      * value). Asynchronous non-blocking call.
      *
      * @param feature. as defined in com.android.ims.ImsConfig#FeatureConstants.
@@ -82,7 +82,7 @@ interface IImsConfig {
 
     /**
      * Sets the value for IMS feature item for specified network type.
-     * This operation stores the user setting in setting db from which master db
+     * This operation stores the user setting in setting db from which main db
      * is dervied.
      *
      * @param feature. as defined in com.android.ims.ImsConfig#FeatureConstants.
diff --git a/telephony/java/com/android/internal/telephony/cdma/SmsMessage.java b/telephony/java/com/android/internal/telephony/cdma/SmsMessage.java
index 542e08d743abd..a34e474e666e2 100644
--- a/telephony/java/com/android/internal/telephony/cdma/SmsMessage.java
+++ b/telephony/java/com/android/internal/telephony/cdma/SmsMessage.java
@@ -479,7 +479,7 @@ public class SmsMessage extends SmsMessageBase {
             length = dis.readUnsignedByte();
             addr.numberOfDigits = length;
 
-            // sanity check on the length
+            // Correctness check on the length
             if (length > pdu.length) {
                 throw new RuntimeException(
                         "createFromPdu: Invalid pdu, addr.numberOfDigits " + length
@@ -496,7 +496,7 @@ public class SmsMessage extends SmsMessageBase {
 
             //encoded BearerData:
             bearerDataLength = dis.readInt();
-            // sanity check on the length
+            // Correctness check on the length
             if (bearerDataLength > pdu.length) {
                 throw new RuntimeException(
                         "createFromPdu: Invalid pdu, bearerDataLength " + bearerDataLength
diff --git a/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java b/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java
index 7d5710e321948..7dd2f6dd8e32e 100644
--- a/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java
+++ b/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java
@@ -354,7 +354,7 @@ public class SmsMessage extends SmsMessageBase {
                 statusReportRequested, ret);
 
         // Skip encoding pdu if error occurs when create pdu head and the error will be handled
-        // properly later on encodedMessage sanity check.
+        // properly later on encodedMessage correctness check.
         if (bo == null) return ret;
 
         // User Data (and length)
@@ -536,7 +536,7 @@ public class SmsMessage extends SmsMessageBase {
                 scAddress, destinationAddress, (byte) 0x41, /* TP-MTI=SMS-SUBMIT, TP-UDHI=true */
                 statusReportRequested, ret);
         // Skip encoding pdu if error occurs when create pdu head and the error will be handled
-        // properly later on encodedMessage sanity check.
+        // properly later on encodedMessage correctness check.
         if (bo == null) return ret;
 
         // TP-Data-Coding-Scheme