Merge "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()" into mnc-dr-dev (f8a4dc4a) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/TelephonyManager.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -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}