commit 137458b4bf3516941483e59c123c22cbee27ed43
author Jay Shrauner <shrauner@google.com> Fri Sep 05 14:27:25 2014 -0700
committer Jay Shrauner <shrauner@google.com> Sat Sep 06 10:39:23 2014 -0700
tree 3bb53887841af31aea157fd24a8f31bb0ed6f32f
parent f5f0daec7eee6b1e27dd98fdd88bc54fa72d4bce

Use framework scheme definitions

Use PhoneAccount defined values for SCHEME_{TEL, SIP, VOICEMAIL}.

Bug:17398074
Change-Id: I36adb16f659daef89957072f9e00d08ea2cb8e9e

src/com/android/phone/CallController.java

diff --git a/src/com/android/phone/CallController.java b/src/com/android/phone/CallController.java
index a42f57d..a25b7a9 100644
--- a/src/com/android/phone/CallController.java
+++ b/src/com/android/phone/CallController.java
@@ -32,6 +32,7 @@
 import android.os.Message;
 import android.os.SystemProperties;
 import android.provider.CallLog.Calls;
+import android.telecomm.PhoneAccount;
 import android.telephony.PhoneNumberUtils;
 import android.telephony.ServiceState;
 import android.util.Log;
@@ -466,7 +467,8 @@
                 //   app.cdmaOtaInCallScreenUiState.state are redundant.
                 //   Combine them.
 
-                boolean voicemailUriSpecified = scheme != null && scheme.equals("voicemail");
+                boolean voicemailUriSpecified = scheme != null &&
+                    scheme.equals(PhoneAccount.SCHEME_VOICEMAIL);
                 // Check for an obscure ECM-related scenario: If the phone
                 // is currently in ECM (Emergency callback mode) and we
                 // dial a non-emergency number, that automatically