summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2018-03-13 01:41:35 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2018-03-13 01:41:35 +0000
commit0dba1eecd82f494d7c6577cc4a8e448bcbe010b1 (patch)
tree70e4e89167214bfcbb9fcdbc4a3d7b314538d208
parentbccb356c704a69470195d6149c1f485140ab941e (diff)
parentd7a485b6e6496bad88fcd29afa15f31bfb9b2478 (diff)
Merge "Allow carrier-privileged apps to access voicemail provider." into pi-dev
-rw-r--r--core/java/android/provider/VoicemailContract.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/provider/VoicemailContract.java b/core/java/android/provider/VoicemailContract.java
index c568b6fbe0c4..140336e93357 100644
--- a/core/java/android/provider/VoicemailContract.java
+++ b/core/java/android/provider/VoicemailContract.java
@@ -49,7 +49,8 @@ import java.util.List;
* </ul>
*
* <P> The minimum permission needed to access this content provider is
- * {@link android.Manifest.permission#ADD_VOICEMAIL}
+ * {@link android.Manifest.permission#ADD_VOICEMAIL} or carrier privileges (see
+ * {@link android.telephony.TelephonyManager#hasCarrierPrivileges}).
*
* <P>Voicemails are inserted by what is called as a "voicemail source"
* application, which is responsible for syncing voicemail data between a remote