Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 140f0398 authored by Nathan Harold's avatar Nathan Harold Committed by Android Git Automerger
Browse files

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

* commit 'aaf280b6':
  Deprecate TelephonyManager.getNeighboringCellInfo()
parents 18aa304f aaf280b6

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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();

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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();

telephony/java/android/telephony/TelephonyManager.java

+6 −5
Original line number Diff line number Diff line
@@ -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();