Merge "Remove field prefixes."

1 files changed, 10 insertions, 11 deletions

diff --git a/java/com/android/voicemail/impl/sms/OmtpMessageSender.java b/java/com/android/voicemail/impl/sms/OmtpMessageSender.java
index 19661e99d..76a258366 100644
--- a/java/com/android/voicemail/impl/sms/OmtpMessageSender.java
+++ b/java/com/android/voicemail/impl/sms/OmtpMessageSender.java
@@ -35,20 +35,20 @@ import com.android.voicemail.impl.VvmLog;
  */
 public abstract class OmtpMessageSender {
   protected static final String TAG = "OmtpMessageSender";
-  protected final Context mContext;
-  protected final PhoneAccountHandle mPhoneAccountHandle;
-  protected final short mApplicationPort;
-  protected final String mDestinationNumber;
+  protected final Context context;
+  protected final PhoneAccountHandle phoneAccountHandle;
+  protected final short applicationPort;
+  protected final String destinationNumber;
 
   public OmtpMessageSender(
       Context context,
       PhoneAccountHandle phoneAccountHandle,
       short applicationPort,
       String destinationNumber) {
-    mContext = context;
-    mPhoneAccountHandle = phoneAccountHandle;
-    mApplicationPort = applicationPort;
-    mDestinationNumber = destinationNumber;
+    this.context = context;
+    this.phoneAccountHandle = phoneAccountHandle;
+    this.applicationPort = applicationPort;
+    this.destinationNumber = destinationNumber;
   }
 
   /**
@@ -78,11 +78,10 @@ public abstract class OmtpMessageSender {
   protected void sendSms(String text, PendingIntent sentIntent) {
 
     VvmLog.v(
-        TAG,
-        String.format("Sending sms '%s' to %s:%d", text, mDestinationNumber, mApplicationPort));
+        TAG, String.format("Sending sms '%s' to %s:%d", text, destinationNumber, applicationPort));
 
     TelephonyMangerCompat.sendVisualVoicemailSms(
-        mContext, mPhoneAccountHandle, mDestinationNumber, mApplicationPort, text, sentIntent);
+        context, phoneAccountHandle, destinationNumber, applicationPort, text, sentIntent);
   }
 
   protected void appendField(StringBuilder sb, String field, Object value) {