Merge "Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"" into mnc-dr-dev am: 42015c4081 am: 5be7dbc88d am: b129c106bd
am: ce73642a58
* commit 'ce73642a5804a50468fa9bc928333653948c5549':
Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 153ddd9..d22727d 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -2874,7 +2874,7 @@
/**
* 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},
@@ -2888,9 +2888,6 @@
* 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}