commit 63ead505949cf8300d7f577ea25d3380fb2a5e8f
author Nancy Chen <nancychen@google.com> Fri May 22 22:17:57 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri May 22 22:17:57 2015 +0000
tree 33075378d281edfafc05e40123ecbf0e5745edc7
parent 655ba991deef029a28ba85371f3c2a7ca68d9c40
parent 93af5a6967f72ba15ddc39600733c02dc95fc6ea

am 93af5a69: Merge "Add a value for the "ct" parameter for outgoing vvm sms messages." into mnc-dev

* commit '93af5a6967f72ba15ddc39600733c02dc95fc6ea':
  Add a value for the "ct" parameter for outgoing vvm sms messages.

src/com/android/phone/vvm/omtp/OmtpConstants.java

diff --git a/src/com/android/phone/vvm/omtp/OmtpConstants.java b/src/com/android/phone/vvm/omtp/OmtpConstants.java
index 971d2d6..fa3cb63 100644
--- a/src/com/android/phone/vvm/omtp/OmtpConstants.java
+++ b/src/com/android/phone/vvm/omtp/OmtpConstants.java
@@ -188,4 +188,6 @@
         put(RETURN_CODE, RETURN_CODE_VALUES);
     }};
 
+    /** Indicates the client is Google visual voicemail version 1.0. */
+    public static final String CLIENT_TYPE_GOOGLE_10 = "google.vvm.10";
 }

src/com/android/phone/vvm/omtp/SimChangeReceiver.java

diff --git a/src/com/android/phone/vvm/omtp/SimChangeReceiver.java b/src/com/android/phone/vvm/omtp/SimChangeReceiver.java
index 917374c..95fcb24 100644
--- a/src/com/android/phone/vvm/omtp/SimChangeReceiver.java
+++ b/src/com/android/phone/vvm/omtp/SimChangeReceiver.java
@@ -103,7 +103,7 @@
         Log.i(TAG, "Requesting VVM activation for subId: " + subId);
         SmsManager smsManager = SmsManager.getSmsManagerForSubscriptionId(subId);
         OmtpMessageSender messageSender = new OmtpMessageSender(smsManager,
-                (short) applicationPort, destinationNumber, null,
+                (short) applicationPort, destinationNumber, OmtpConstants.CLIENT_TYPE_GOOGLE_10,
                 OmtpConstants.PROTOCOL_VERSION1_1, null);
         messageSender.requestVvmActivation(null);
     }