diff options
| author | Nathan Harold <nharold@google.com> | 2015-10-22 02:03:32 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-10-22 02:03:32 +0000 |
| commit | dc9f8fab0fd9485b22651fe5c7f70961d67d697a (patch) | |
| tree | cd3c7e63039e3bf8eb6b37fab2a4bdea1f2fe550 /telephony | |
| parent | 655c12edb0312933249659ab6b23191adcba4fa3 (diff) | |
| parent | f8a4dc4a6f8383fc2999ce1292d900912a0da842 (diff) | |
| download | frameworks_base-dc9f8fab0fd9485b22651fe5c7f70961d67d697a.zip frameworks_base-dc9f8fab0fd9485b22651fe5c7f70961d67d697a.tar.gz frameworks_base-dc9f8fab0fd9485b22651fe5c7f70961d67d697a.tar.bz2 | |
Merge "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()" into mnc-dr-dev
am: f8a4dc4a6f
* commit 'f8a4dc4a6f8383fc2999ce1292d900912a0da842':
Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index d22727d..153ddd9 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -2874,7 +2874,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}, @@ -2888,6 +2888,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} |