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

Merge changes from topic 'merge_docs_nyc-dev' into nyc-dev

Browse Source 
* changes:
  Remove links to createAndInitializeUser() and createUser()
  Resolve merge conflicts of a5060ee to nyc-dev
This commit is contained in:
Trevor Johns
2016-04-20 18:35:54 +00:00
committed by Android (Google) Code Review
parent db973df830 483abe2d8b
commit 59c9a93fc2
2110 changed files with 367713 additions and 96912 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2869,27 +2869,40 @@ 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.
*<p>
* The list can include one or more of {@link android.telephony.CellInfoGsm CellInfoGsm},
* {@link android.telephony.CellInfoCdma CellInfoCdma},
* {@link android.telephony.CellInfoLte CellInfoLte} and
* {@link android.telephony.CellInfoWcdma CellInfoWcdma} in any combination.
* Specifically on devices with multiple radios it is typical to see instances of
* one or more of any these in the list. In addition 0, 1 or more CellInfo
* objects may return isRegistered() true.
*<p>
* This is preferred over using getCellLocation although for older
* 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.
* device including the primary and neighboring cells. Calling this method does
* not trigger a call to {@link android.telephony.PhoneStateListener#onCellInfoChanged
* onCellInfoChanged()}, or change the rate at which
* {@link android.telephony.PhoneStateListener#onCellInfoChanged
* onCellInfoChanged()} is called.
*
*<p>
* The list can include one or more {@link android.telephony.CellInfoGsm CellInfoGsm},
* {@link android.telephony.CellInfoCdma CellInfoCdma},
* {@link android.telephony.CellInfoLte CellInfoLte}, and
* {@link android.telephony.CellInfoWcdma CellInfoWcdma} objects, in any combination.
* On devices with multiple radios it is typical to see instances of
* one or more of any these in the list. In addition, zero, one, or more
* of the returned objects may be considered registered; that is, their
* {@link android.telephony.CellInfo#isRegistered CellInfo.isRegistered()}
* methods may return true.
*
* <p>This method returns valid data for registered cells on devices with
* {@link android.content.pm.PackageManager#FEATURE_TELEPHONY}.
*
*<p>
* This method is preferred over using {@link
* android.telephony.TelephonyManager#getCellLocation getCellLocation()}.
* However, for older devices, <code>getAllCellInfo()</code> may return
* null. In these cases, you should call {@link
* android.telephony.TelephonyManager#getCellLocation getCellLocation()}
* instead.
*
* <p>Requires permission:
* {@link android.Manifest.permission#ACCESS_COARSE_LOCATION}
*
* @return List of {@link android.telephony.CellInfo}; null if cell
* information is unavailable.
*
* <p>Requires Permission: {@link android.Manifest.permission#ACCESS_COARSE_LOCATION}
*/
public List<CellInfo> getAllCellInfo() {
try {