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

Commit fddda44b authored by nharold's avatar nharold Committed by android-build-merger
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
am: 74568130

Change-Id: I3112e4d98738b7b00e290ced238c3878e4ad51b1
parents 28cbafd0 74568130

api/current.txt

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