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

Merge "Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"" into mnc-dr-dev

Browse Source 
am: 42015c4081

* commit '42015c4081f9d37d579f0be15e11725cf6cc5fba':
  Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"
This commit is contained in:
Nathan Harold
2015-10-22 02:58:15 +00:00
committed by android-build-merger
parent dc9f8fab0f 42015c4081
commit 5be7dbc88d
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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}