diff options
| author | Nathan Harold <nharold@google.com> | 2015-10-22 02:58:15 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-10-22 02:58:15 +0000 |
| commit | 5be7dbc88d0460dfede5373f1204f4645ce99726 (patch) | |
| tree | 1fbf3f9537d4c49eb3b2bda78fa04a30d82cf17c /telephony | |
| parent | dc9f8fab0fd9485b22651fe5c7f70961d67d697a (diff) | |
| parent | 42015c4081f9d37d579f0be15e11725cf6cc5fba (diff) | |
| download | frameworks_base-5be7dbc88d0460dfede5373f1204f4645ce99726.zip frameworks_base-5be7dbc88d0460dfede5373f1204f4645ce99726.tar.gz frameworks_base-5be7dbc88d0460dfede5373f1204f4645ce99726.tar.bz2 | |
Merge "Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"" into mnc-dr-dev
am: 42015c4081
* commit '42015c4081f9d37d579f0be15e11725cf6cc5fba':
Revert "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, 1 insertions, 4 deletions
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 @@ 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 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 @@ 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} |