Merge "Revert "Add the FEATURE_TELEPHONY restriction to... (ce73642a) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/TelephonyManager.java

+1 −4

Original line number	Original line	Diff line number	Diff line
	@@ -2874,7 +2874,7 @@ public class TelephonyManager {
	/**		/**
	* Returns all observed cell information from all radios on the		* Returns all observed cell information from all radios on the
	* device including the primary and neighboring cells. This does		* 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>		*<p>
	* The list can include one or more of {@link android.telephony.CellInfoGsm CellInfoGsm},		* The list can include one or more of {@link android.telephony.CellInfoGsm CellInfoGsm},
	* {@link android.telephony.CellInfoCdma CellInfoCdma},		* {@link android.telephony.CellInfoCdma CellInfoCdma},
	@@ -2888,9 +2888,6 @@ public class TelephonyManager {
	* devices this may return null in which case getCellLocation should		* devices this may return null in which case getCellLocation should
	* be called.		* be called.
	*<p>		*<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.		* @return List of CellInfo or null if info unavailable.
	*		*
	* <p>Requires Permission: {@link android.Manifest.permission#ACCESS_COARSE_LOCATION}		* <p>Requires Permission: {@link android.Manifest.permission#ACCESS_COARSE_LOCATION}