diff --git a/api/current.txt b/api/current.txt index dc2daecc25d1b..43705059365b3 100644 --- a/api/current.txt +++ b/api/current.txt @@ -38165,7 +38165,7 @@ package android.telephony { method public java.util.List 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 boolean getDataEnabled(); method public int getDataNetworkType(); diff --git a/api/system-current.txt b/api/system-current.txt index 9271c721a2440..d8014487e353e 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -41378,7 +41378,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(); diff --git a/api/test-current.txt b/api/test-current.txt index 70e097f2b84bb..084fb363cb4fc 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -38264,7 +38264,7 @@ package android.telephony { method public java.util.List 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 boolean getDataEnabled(); method public int getDataNetworkType(); diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index f3c72af62af79..26d46ac9cb0c5 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -1035,14 +1035,15 @@ public class TelephonyManager { * this method will return null. The implementation must not to try add LTE * identifiers into the existing cdma/gsm classes. *

- * In the future this call will be deprecated. - *

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

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();