diff options
| author | Nathan Harold <nharold@google.com> | 2015-06-26 21:47:05 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-26 21:47:21 +0000 |
| commit | aaf280b6b17ceaabc0b54fbc8479c14dfb4f6e64 (patch) | |
| tree | adf678bd7e176653398efd8e7f3429bdb9de0d3f | |
| parent | 869c230c1466e517289d692dce85acf0c30296c4 (diff) | |
| parent | 748e9d59792184e6a2122c78d51ab7ea8fa8d559 (diff) | |
| download | frameworks_base-aaf280b6b17ceaabc0b54fbc8479c14dfb4f6e64.zip frameworks_base-aaf280b6b17ceaabc0b54fbc8479c14dfb4f6e64.tar.gz frameworks_base-aaf280b6b17ceaabc0b54fbc8479c14dfb4f6e64.tar.bz2 | |
Merge "Deprecate TelephonyManager.getNeighboringCellInfo()" into mnc-dev
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 | ||||
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 11 |
3 files changed, 8 insertions, 7 deletions
diff --git a/api/current.txt b/api/current.txt index 2d51b97..33e4182 100644 --- a/api/current.txt +++ b/api/current.txt @@ -31080,7 +31080,7 @@ package android.telephony { method public java.lang.String getLine1Number(); method public java.lang.String getMmsUAProfUrl(); 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 getNetworkOperator(); method public java.lang.String getNetworkOperatorName(); diff --git a/api/system-current.txt b/api/system-current.txt index 33c7a1b..d862566 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -33336,7 +33336,7 @@ package android.telephony { method public java.lang.String getLine1Number(); method public java.lang.String getMmsUAProfUrl(); 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 getNetworkOperator(); method public java.lang.String getNetworkOperatorName(); diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index a2bd74b..ab2a98d 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -891,16 +891,17 @@ public class TelephonyManager { } /** - * Returns the neighboring cell information of the device. The getAllCellInfo is preferred - * and use this only if getAllCellInfo return nulls or an empty list. - *<p> - * In the future this call will be deprecated. - *<p> + * Returns the neighboring cell information of the device. + * * @return List of NeighboringCellInfo or null if info unavailable. * * <p>Requires Permission: * (@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() { try { ITelephony telephony = getITelephony(); |