Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()

Browse Source 
-Fixed doc string

Bug: 23979591

This reverts commit f7b6474de8.

Change-Id: I127f1452f4319a154dd4d962d4a63c84f0833702
This commit is contained in:
Nathan Harold
2015-10-21 20:12:10 -07:00
parent 42015c4081
commit 0dccd12800
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -2834,7 +2834,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 PhoneStateListner#onCellInfoChanged. * not cause or change the rate of PhoneStateListener#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},
@@ -2848,6 +2848,9 @@ 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}