From fc37b02f5d3381a7882770941e461b13b679b6ef Mon Sep 17 00:00:00 2001 From: Eric Erfanian Date: Tue, 21 Mar 2017 10:11:17 -0700 Subject: Update AOSP Dialer source from internal google3 repository at cl/150756069 Test: make, treehugger This CL updates the AOSP Dialer source with all the changes that have gone into the private google3 repository. This includes all the changes from cl/150392808 (3/16/2017) to cl/150756069 (3/21/2017). This goal of these drops is to keep the AOSP source in sync with the internal google3 repository. Currently these sync are done by hand with very minor modifications to the internal source code. See the Android.mk file for list of modifications. Our current goal is to do frequent drops (daily if possible) and eventually switched to an automated process. Change-Id: I0888b5db52efb28eb8194600e0c7804592f975f3 --- .../voicemail/impl/protocol/VisualVoicemailProtocolFactory.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'java/com/android/voicemail/impl/protocol') diff --git a/java/com/android/voicemail/impl/protocol/VisualVoicemailProtocolFactory.java b/java/com/android/voicemail/impl/protocol/VisualVoicemailProtocolFactory.java index 056fb2eaf..ef27c2202 100644 --- a/java/com/android/voicemail/impl/protocol/VisualVoicemailProtocolFactory.java +++ b/java/com/android/voicemail/impl/protocol/VisualVoicemailProtocolFactory.java @@ -19,14 +19,13 @@ package com.android.voicemail.impl.protocol; import android.content.res.Resources; import android.support.annotation.Nullable; import android.telephony.TelephonyManager; +import com.android.voicemail.VisualVoicemailTypeExtensions; import com.android.voicemail.impl.VvmLog; public class VisualVoicemailProtocolFactory { private static final String TAG = "VvmProtocolFactory"; - private static final String VVM_TYPE_VVM3 = "vvm_type_vvm3"; - @Nullable public static VisualVoicemailProtocol create(Resources resources, String type) { if (type == null) { @@ -37,7 +36,7 @@ public class VisualVoicemailProtocolFactory { return new OmtpProtocol(); case TelephonyManager.VVM_TYPE_CVVM: return new CvvmProtocol(); - case VVM_TYPE_VVM3: + case VisualVoicemailTypeExtensions.VVM_TYPE_VVM3: return new Vvm3Protocol(); default: VvmLog.e(TAG, "Unexpected visual voicemail type: " + type); -- cgit v1.2.3