commit 324d59cc0242dd825f3f8ddb5a69377d4fb0e18c
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jun 23 02:32:56 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 23 02:32:56 2016 +0000
tree 9366d7c9529752b49f70af525cc0161d0436a89f
parent a0d3aec9f17236e8618d9a9aaeaec611215bc5e4
parent 915e98adeceb657c902b333199d5c8dac5c5ffb0

Merge "Change VVM3 default prompt level to no guest prompts" into nyc-mr1-dev

src/com/android/phone/vvm/omtp/protocol/Vvm3Protocol.java

diff --git a/src/com/android/phone/vvm/omtp/protocol/Vvm3Protocol.java b/src/com/android/phone/vvm/omtp/protocol/Vvm3Protocol.java
index 8318318..df84034 100644
--- a/src/com/android/phone/vvm/omtp/protocol/Vvm3Protocol.java
+++ b/src/com/android/phone/vvm/omtp/protocol/Vvm3Protocol.java
@@ -55,8 +55,11 @@
 
     private static String ISO639_Spanish = "es";
 
-    private static String VVM3_VM_LANGUAGE_ENGLISH_STANDARD = "1";
-    private static String VVM3_VM_LANGUAGE_SPANISH_STANDARD = "2";
+    // Default prompt level when using the telephone user interface.
+    // Standard prompt when the user call into the voicemail, and no prompts when someone else is
+    // leaving a voicemail.
+    private static String VVM3_VM_LANGUAGE_ENGLISH_STANDARD_NO_GUEST_PROMPTS = "5";
+    private static String VVM3_VM_LANGUAGE_SPANISH_STANDARD_NO_GUEST_PROMPTS = "6";
 
     private static final int PIN_LENGTH = 6;
 
@@ -147,10 +150,12 @@
                 if (Locale.getDefault().getLanguage()
                         .equals(new Locale(ISO639_Spanish).getLanguage())) {
                     // Spanish
-                    helper.changeVoicemailTuiLanguage(VVM3_VM_LANGUAGE_SPANISH_STANDARD);
+                    helper.changeVoicemailTuiLanguage(
+                            VVM3_VM_LANGUAGE_SPANISH_STANDARD_NO_GUEST_PROMPTS);
                 } else {
                     // English
-                    helper.changeVoicemailTuiLanguage(VVM3_VM_LANGUAGE_ENGLISH_STANDARD);
+                    helper.changeVoicemailTuiLanguage(
+                            VVM3_VM_LANGUAGE_ENGLISH_STANDARD_NO_GUEST_PROMPTS);
                 }
                 VvmLog.i(TAG, "new user: language set");