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

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

Merge "Merge "Deprecate TelephonyManager.getCellLocation()" am: bc0f610b am:... 

Merge "Merge "Deprecate TelephonyManager.getCellLocation()" am: bc0f610b am: a5117394 am: 599a4c73" into oc-dev-plus-aosp
parents c9b051fc f72fd56b

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -40069,7 +40069,7 @@ package android.telephony { 
    method public java.util.List<android.telephony.CellInfo> getAllCellInfo();

    method public int getCallState();

    method public android.os.PersistableBundle getCarrierConfig();

    method public android.telephony.CellLocation getCellLocation();

    method public deprecated android.telephony.CellLocation getCellLocation();

    method public int getDataActivity();

    method public int getDataNetworkType();

    method public int getDataState();

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -43554,7 +43554,7 @@ package android.telephony { 
    method public java.lang.String getCdmaMdn(int);

    method public java.lang.String getCdmaMin();

    method public java.lang.String getCdmaMin(int);

    method public android.telephony.CellLocation getCellLocation();

    method public deprecated android.telephony.CellLocation getCellLocation();

    method public int getCurrentPhoneType();

    method public int getCurrentPhoneType(int);

    method public int getDataActivity();

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -40284,7 +40284,7 @@ package android.telephony { 
    method public java.util.List<android.telephony.CellInfo> getAllCellInfo();

    method public int getCallState();

    method public android.os.PersistableBundle getCarrierConfig();

    method public android.telephony.CellLocation getCellLocation();

    method public deprecated android.telephony.CellLocation getCellLocation();

    method public int getDataActivity();

    method public int getDataNetworkType();

    method public int getDataState();

telephony/java/android/telephony/TelephonyManager.java

+3 −2
Original line number Diff line number Diff line
@@ -1087,14 +1087,15 @@ public class TelephonyManager { 
     * this method will return null. The implementation must not to try add LTE

     * identifiers into the existing cdma/gsm classes.

     *<p>

     * In the future this call will be deprecated.

     *<p>

     * @return Current location of the device or null if not available.

     *

     * <p>Requires Permission:

     * {@link android.Manifest.permission#ACCESS_COARSE_LOCATION ACCESS_COARSE_LOCATION} or

     * {@link android.Manifest.permission#ACCESS_COARSE_LOCATION ACCESS_FINE_LOCATION}.

     *

     * @deprecated use {@link #getAllCellInfo} instead, which returns a superset of this API.

     */

    @Deprecated

    public CellLocation getCellLocation() {

        try {

            ITelephony telephony = getITelephony();