From: Ta-wei Yen <twyen@google.com>
Date: Thu, 26 Jan 2017 03:33:30 +0000 (+0000)
Subject: Merge "Add getVisualVoicemailPackageName() Make NMR2 voicemail columns public"
X-Git-Tag: android-x86-8.1-r1~4759
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=51a403525f5305d02029d86568c17d58f19ca870;p=android-x86%2Fframeworks-base.git

Merge "Add getVisualVoicemailPackageName() Make NMR2 voicemail columns public"
---

51a403525f5305d02029d86568c17d58f19ca870
diff --cc core/java/android/provider/VoicemailContract.java
index e48a0d08de7d,36f63b359de3..a8b094eab0a2
--- a/core/java/android/provider/VoicemailContract.java
+++ b/core/java/android/provider/VoicemailContract.java
@@@ -317,9 -313,9 +313,9 @@@ public class VoicemailContract 
           *
           * <P>Type: INTEGER (boolean)</P>
           *
-          * @hide
+          * @see android.telephony.TelephonyManager#getVisualVoicemailPackageName
           */
 -        public static final String IS_OMTP_VOICEMAIL = "is_omtp_voicmail";
 +        public static final String IS_OMTP_VOICEMAIL = "is_omtp_voicemail";
  
          /**
           * A convenience method to build voicemail URI specific to a source package by appending