summaryrefslogtreecommitdiffstats
path: root/telephony
diff options
context:
space:
mode:
authorNathan Harold <nharold@google.com>2015-10-21 20:12:10 -0700
committerNathan Harold <nharold@google.com>2015-10-21 20:35:46 -0700
commit0dccd128001ceff9437f736bd70dfd1986e315d5 (patch)
tree6c35fcb9e12e7ca25af3d7e525ce13813de24dae /telephony
parent42015c4081f9d37d579f0be15e11725cf6cc5fba (diff)
downloadframeworks_base-0dccd128001ceff9437f736bd70dfd1986e315d5.zip
frameworks_base-0dccd128001ceff9437f736bd70dfd1986e315d5.tar.gz
frameworks_base-0dccd128001ceff9437f736bd70dfd1986e315d5.tar.bz2
Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
-Fixed doc string Bug: 23979591 This reverts commit f7b6474de87fd2eee377dc612c757102cdacc003. Change-Id: I127f1452f4319a154dd4d962d4a63c84f0833702
Diffstat (limited to 'telephony')
-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 47f13c9..65caf56 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -2834,7 +2834,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},
@@ -2848,6 +2848,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}