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

Merge "Deprecate TelephonyManager.getNeighboringCellInfo()" into mnc-dev

Browse Source
This commit is contained in:
Nathan Harold
2015-06-26 21:47:05 +00:00
committed by Android (Google) Code Review
parent 869c230c14 748e9d5979
commit aaf280b6b1
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -31080,7 +31080,7 @@ package android.telephony {
method public java.lang.String getLine1Number(); method public java.lang.String getLine1Number();
method public java.lang.String getMmsUAProfUrl(); method public java.lang.String getMmsUAProfUrl();
method public java.lang.String getMmsUserAgent(); method public java.lang.String getMmsUserAgent();
method public java.util.List<android.telephony.NeighboringCellInfo> getNeighboringCellInfo(); method public deprecated java.util.List<android.telephony.NeighboringCellInfo> getNeighboringCellInfo();
method public java.lang.String getNetworkCountryIso(); method public java.lang.String getNetworkCountryIso();
method public java.lang.String getNetworkOperator(); method public java.lang.String getNetworkOperator();
method public java.lang.String getNetworkOperatorName(); method public java.lang.String getNetworkOperatorName();

2
api/system-current.txt
View File

@@ -33336,7 +33336,7 @@ package android.telephony {
method public java.lang.String getLine1Number(); method public java.lang.String getLine1Number();
method public java.lang.String getMmsUAProfUrl(); method public java.lang.String getMmsUAProfUrl();
method public java.lang.String getMmsUserAgent(); method public java.lang.String getMmsUserAgent();
method public java.util.List<android.telephony.NeighboringCellInfo> getNeighboringCellInfo(); method public deprecated java.util.List<android.telephony.NeighboringCellInfo> getNeighboringCellInfo();
method public java.lang.String getNetworkCountryIso(); method public java.lang.String getNetworkCountryIso();
method public java.lang.String getNetworkOperator(); method public java.lang.String getNetworkOperator();
method public java.lang.String getNetworkOperatorName(); method public java.lang.String getNetworkOperatorName();

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

@@ -891,16 +891,17 @@ public class TelephonyManager {
} }
/** /**
* Returns the neighboring cell information of the device. The getAllCellInfo is preferred * Returns the neighboring cell information of the device.
* and use this only if getAllCellInfo return nulls or an empty list. *
*<p>
* In the future this call will be deprecated.
*<p>
* @return List of NeighboringCellInfo or null if info unavailable. * @return List of NeighboringCellInfo or null if info unavailable.
* *
* <p>Requires Permission: * <p>Requires Permission:
* (@link android.Manifest.permission#ACCESS_COARSE_UPDATES} * (@link android.Manifest.permission#ACCESS_COARSE_UPDATES}
*
* @deprecated Use (@link getAllCellInfo} which returns a superset of the information
* from NeighboringCellInfo.
*/ */
@Deprecated
public List<NeighboringCellInfo> getNeighboringCellInfo() { public List<NeighboringCellInfo> getNeighboringCellInfo() {
try { try {
ITelephony telephony = getITelephony(); ITelephony telephony = getITelephony();