Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Deprecate TelephonyManager.getCellLocation()"

Browse Source 
am: bc0f610b25

Change-Id: Ic6f55f3f00b608f3b8c3212b0dea1114250ec1fe
This commit is contained in:
nharold
2017-04-10 23:10:01 +00:00
committed by android-build-merger
parent d86c1fca76 bc0f610b25
commit a51173943a
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -38165,7 +38165,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 boolean getDataEnabled();
method public int getDataNetworkType();

2
api/system-current.txt
View File

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

2
api/test-current.txt
View File

@@ -38264,7 +38264,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 boolean getDataEnabled();
method public int getDataNetworkType();

5
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -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.
*<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();