summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author nharold <nharold@google.com> 2016-10-25 01:11:02 +0000
committer android-build-merger <android-build-merger@google.com> 2016-10-25 01:11:02 +0000
commit415a50e103db4636c6b62ecce7436aaa65e23c19 (patch)
tree4aa2753e287e24b665ef4c5bce56939ef9a9de9e
parent434ea7aed44210b552f7158acddcab887aef571a (diff)
parentc8fceb983461115f1dd154a897d41f6000947548 (diff)
Merge "Update the docstring on getAllCellInfo() for unreported values" am: 88d0a95c74 am: b7e5c6fa32
am: c8fceb9834 Change-Id: Iba303da06ad35991a610aaf554fbd428cc90ca9e
-rw-r--r--telephony/java/android/telephony/TelephonyManager.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 093ddb660d98..3cc425d7189b 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -3160,7 +3160,10 @@ public class TelephonyManager {
* methods may return true.
*
* <p>This method returns valid data for registered cells on devices with
- * {@link android.content.pm.PackageManager#FEATURE_TELEPHONY}.
+ * {@link android.content.pm.PackageManager#FEATURE_TELEPHONY}. In cases where only
+ * partial information is available for a particular CellInfo entry, unavailable fields
+ * will be reported as Integer.MAX_VALUE. All reported cells will include at least a
+ * valid set of technology-specific identification info and a power level measurement.
*
*<p>
* This method is preferred over using {@link