summaryrefslogtreecommitdiffstats
path: root/telecomm
diff options
context:
space:
mode:
authorSantos Cordon <santoscordon@google.com>2015-05-14 02:10:33 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-14 02:10:34 +0000
commite9ea718f30915a5fdb37030bc4073038a95491ae (patch)
treea7474915aa056dbb06a14423eef08354abe312d7 /telecomm
parentd9e1fe3cd443e02e64f6006be4bc5d5622082675 (diff)
parented769ae5d2cc830714b0a05c1b4f794ff38c00b1 (diff)
downloadframeworks_base-e9ea718f30915a5fdb37030bc4073038a95491ae.zip
frameworks_base-e9ea718f30915a5fdb37030bc4073038a95491ae.tar.gz
frameworks_base-e9ea718f30915a5fdb37030bc4073038a95491ae.tar.bz2
Merge "Improve javadoc for PRESENTATION_ constants." into mnc-dev
Diffstat (limited to 'telecomm')
-rw-r--r--telecomm/java/android/telecom/TelecomManager.java16
1 files changed, 12 insertions, 4 deletions
diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java
index b2c036c..c8ed2b0 100644
--- a/telecomm/java/android/telecom/TelecomManager.java
+++ b/telecomm/java/android/telecom/TelecomManager.java
@@ -333,16 +333,24 @@ public class TelecomManager {
* displayed to the user.
*/
- /** Property is displayed normally. */
+ /**
+ * Indicates that the address or number of a call is allowed to be displayed for caller ID.
+ */
public static final int PRESENTATION_ALLOWED = 1;
- /** Property was blocked. */
+ /**
+ * Indicates that the address or number of a call is blocked by the other party.
+ */
public static final int PRESENTATION_RESTRICTED = 2;
- /** Presentation was not specified or is unknown. */
+ /**
+ * Indicates that the address or number of a call is not specified or known by the carrier.
+ */
public static final int PRESENTATION_UNKNOWN = 3;
- /** Property should be displayed as a pay phone. */
+ /**
+ * Indicates that the address or number of a call belongs to a pay phone.
+ */
public static final int PRESENTATION_PAYPHONE = 4;
private static final String TAG = "TelecomManager";