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

Commit 66c63a4b authored by Nathan Harold's avatar Nathan Harold Committed by android-build-merger
Browse files

Merge "Remove getNeighboringCell API" 

am: e164be31

Change-Id: If1fb597b4d1058359fd1ecebc4f3dec8691fc6d5
parents 83919e08 e164be31

api/current.txt

+1 −2
Original line number Diff line number Diff line
@@ -42266,7 +42266,7 @@ package android.telephony { 
    method public android.telephony.mbms.StreamingService startStreaming(android.telephony.mbms.StreamingServiceInfo, java.util.concurrent.Executor, android.telephony.mbms.StreamingServiceCallback);

  }













  public class NeighboringCellInfo implements android.os.Parcelable {













  public deprecated class NeighboringCellInfo implements android.os.Parcelable {















    ctor public deprecated NeighboringCellInfo();















    ctor public deprecated NeighboringCellInfo(int, int);















    ctor public NeighboringCellInfo(int, java.lang.String, int);










@@ -42723,7 +42723,6 @@ package android.telephony {













    method public java.lang.String getMmsUAProfUrl();















    method public java.lang.String getMmsUserAgent();















    method public java.lang.String getNai();













    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/removed.txt



+1
−0




























Original line number
Diff line number
Diff line








@@ -540,6 +540,7 @@ package android.telephony {













  }































  public class TelephonyManager {













    method public deprecated java.util.List<android.telephony.NeighboringCellInfo> getNeighboringCellInfo();















    method public deprecated android.telephony.NetworkScan requestNetworkScan(android.telephony.NetworkScanRequest, android.telephony.TelephonyScanManager.NetworkScanCallback);















  }

















































telephony/java/android/telephony/NeighboringCellInfo.java



+4
−0




























Original line number
Diff line number
Diff line








@@ -32,7 +32,11 @@ import android.os.Parcelable;













/**















 * Represents the neighboring cell information, including















 * Received Signal Strength and Cell ID location.













 *













 * @deprecated This class should not be used by anyone targeting SDK level 29 (Q) or higher.













 *      Instead callers should use {@Link android.telephony.CellInfo}.















 */













@Deprecated















public class NeighboringCellInfo implements Parcelable















{















    /**

































telephony/java/android/telephony/TelephonyManager.java



+1
−0




























Original line number
Diff line number
Diff line








@@ -1579,6 +1579,7 @@ public class TelephonyManager {













     *















     * @return List of NeighboringCellInfo or null if info unavailable.















     *













     * @removed















     * @deprecated Use {@link #getAllCellInfo} which returns a superset of the information















     *             from NeighboringCellInfo, including LTE cell information.















     */