diff options
| author | Nathan Harold <nharold@google.com> | 2015-10-22 02:54:45 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-22 02:54:45 +0000 |
| commit | 42015c4081f9d37d579f0be15e11725cf6cc5fba (patch) | |
| tree | 3bee8591acdbc3180738ea2e4ffe3ba395c657f6 /telephony/java/android | |
| parent | f8a4dc4a6f8383fc2999ce1292d900912a0da842 (diff) | |
| parent | f7b6474de87fd2eee377dc612c757102cdacc003 (diff) | |
| download | frameworks_base-42015c4081f9d37d579f0be15e11725cf6cc5fba.zip frameworks_base-42015c4081f9d37d579f0be15e11725cf6cc5fba.tar.gz frameworks_base-42015c4081f9d37d579f0be15e11725cf6cc5fba.tar.bz2 | |
Merge "Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"" into mnc-dr-dev
Diffstat (limited to 'telephony/java/android')
| -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 053d89f..47f13c9 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -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 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}, @@ -2848,9 +2848,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} |