Merge "Add warning about TelephonyManager Reliability" into rvc-dev am: ae87a963b8

Change-Id: I72807984807146851df4c8598798b5f8ff161813
This commit is contained in:
Nathan Harold
2020-04-09 16:40:06 +00:00
committed by Automerger Merge Worker

View File

@@ -147,6 +147,10 @@ import java.util.regex.Pattern;
* information unless it has the appropriate permissions declared in * information unless it has the appropriate permissions declared in
* its manifest file. Where permissions apply, they are noted in the * its manifest file. Where permissions apply, they are noted in the
* the methods through which you access the protected information. * the methods through which you access the protected information.
*
* <p>TelephonyManager is intended for use on devices that implement
* {@link android.content.pm.PackageManager#FEATURE_TELEPHONY FEATURE_TELEPHONY}. On devices
* that do not implement this feature, the behavior is not reliable.
*/ */
@SystemService(Context.TELEPHONY_SERVICE) @SystemService(Context.TELEPHONY_SERVICE)
public class TelephonyManager { public class TelephonyManager {
@@ -5842,6 +5846,10 @@ public class TelephonyManager {
* {@link android.telephony.PhoneStateListener#onCellInfoChanged onCellInfoChanged()} * {@link android.telephony.PhoneStateListener#onCellInfoChanged onCellInfoChanged()}
* for each active subscription. * for each active subscription.
* *
* <p>This method returns valid data for devices with
* {@link android.content.pm.PackageManager#FEATURE_TELEPHONY FEATURE_TELEPHONY}. On devices
* that do not implement this feature, the behavior is not reliable.
*
* @param executor the executor on which callback will be invoked. * @param executor the executor on which callback will be invoked.
* @param callback a callback to receive CellInfo. * @param callback a callback to receive CellInfo.
*/ */
@@ -5888,6 +5896,10 @@ public class TelephonyManager {
* {@link android.telephony.PhoneStateListener#onCellInfoChanged onCellInfoChanged()} * {@link android.telephony.PhoneStateListener#onCellInfoChanged onCellInfoChanged()}
* for each active subscription. * for each active subscription.
* *
* <p>This method returns valid data for devices with
* {@link android.content.pm.PackageManager#FEATURE_TELEPHONY FEATURE_TELEPHONY}. On devices
* that do not implement this feature, the behavior is not reliable.
*
* @param workSource the requestor to whom the power consumption for this should be attributed. * @param workSource the requestor to whom the power consumption for this should be attributed.
* @param executor the executor on which callback will be invoked. * @param executor the executor on which callback will be invoked.
* @param callback a callback to receive CellInfo. * @param callback a callback to receive CellInfo.