summaryrefslogtreecommitdiffstats
path: root/telephony/java
diff options
context:
space:
mode:
authorNathan Harold <nharold@google.com>2015-10-22 02:53:57 +0000
committerNathan Harold <nharold@google.com>2015-10-22 02:53:57 +0000
commitf7b6474de87fd2eee377dc612c757102cdacc003 (patch)
tree5f294e26e806a661ae1f73af931419d920433ace /telephony/java
parent5d1429e0dd1a13f76dbb354f9e4e415f71956299 (diff)
downloadframeworks_base-f7b6474de87fd2eee377dc612c757102cdacc003.zip
frameworks_base-f7b6474de87fd2eee377dc612c757102cdacc003.tar.gz
frameworks_base-f7b6474de87fd2eee377dc612c757102cdacc003.tar.bz2
Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"
This reverts commit 5d1429e0dd1a13f76dbb354f9e4e415f71956299. Doc string isn't resolving. Temporarily reverting. Change-Id: I128b13abcf938c96b24225e373ac0885c24e083e
Diffstat (limited to 'telephony/java')
-rw-r--r--telephony/java/android/telephony/TelephonyManager.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 053d89f..47f13c9 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 PhoneStateListener#onCellInfoChanged.
+ * not cause or change the rate of PhoneStateListner#onCellInfoChanged.
*<p>
* The list can include one or more of {@link android.telephony.CellInfoGsm CellInfoGsm},
* {@link android.telephony.CellInfoCdma CellInfoCdma},
@@ -2848,9 +2848,6 @@ 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}