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

Commit 4323b050 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Remove getNeighboringCell API" am: e164be31 am: 66c63a4b am: 473c9609"

parents ac72451f 06b4e469

api/current.txt

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










@@ -43030,7 +43030,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








@@ -545,6 +545,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








@@ -1590,6 +1590,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.















     */