summaryrefslogtreecommitdiffstats
path: root/telephony/java/android
diff options
context:
space:
mode:
authorNathan Harold <nharold@google.com>2015-10-22 05:23:34 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-10-22 05:23:34 +0000
commit64e8bdc4760aebf7f8c80ce3384120ed9b01a3ec (patch)
tree5c5daaa75a8fce39e946d5091d838fc46b88924a /telephony/java/android
parent5be7dbc88d0460dfede5373f1204f4645ce99726 (diff)
parent0dccd128001ceff9437f736bd70dfd1986e315d5 (diff)
downloadframeworks_base-64e8bdc4760aebf7f8c80ce3384120ed9b01a3ec.zip
frameworks_base-64e8bdc4760aebf7f8c80ce3384120ed9b01a3ec.tar.gz
frameworks_base-64e8bdc4760aebf7f8c80ce3384120ed9b01a3ec.tar.bz2
Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
am: 0dccd12800 * commit '0dccd128001ceff9437f736bd70dfd1986e315d5': Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
Diffstat (limited to 'telephony/java/android')
-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 d22727d..6b1b6296 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -2874,7 +2874,7 @@ public class TelephonyManager {
/**
* Returns all observed cell information from all radios on the
* device including the primary and neighboring cells. This does
- * not cause or change the rate of PhoneStateListner#onCellInfoChanged.
+ * not cause or change the rate of PhoneStateListener#onCellInfoChanged.
*<p>
* The list can include one or more of {@link android.telephony.CellInfoGsm CellInfoGsm},
* {@link android.telephony.CellInfoCdma CellInfoCdma},
@@ -2888,6 +2888,9 @@ public class TelephonyManager {
* devices this may return null in which case getCellLocation should
* be called.
*<p>
+ * This API will return valid data for registered cells on devices with
+ * {@link android.content.pm.PackageManager#FEATURE_TELEPHONY}
+ *<p>
* @return List of CellInfo or null if info unavailable.
*
* <p>Requires Permission: {@link android.Manifest.permission#ACCESS_COARSE_LOCATION}