drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge "Deprecate TelephonyManager.getCellLocation()" am: bc0f610b25 am: a51173943a am: 599a4c7326" into oc-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2017-04-10 23:31:47 +00:00
committed by Android (Google) Code Review
parent c9b051fc18 f72fd56b06
commit 74568130ce
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

@ -40069,7 +40069,7 @@ package android.telephony {
method public java.util.List<android.telephony.CellInfo> getAllCellInfo(); method public java.util.List<android.telephony.CellInfo> getAllCellInfo();
method public int getCallState(); method public int getCallState();
method public android.os.PersistableBundle getCarrierConfig(); 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 getDataActivity();
method public int getDataNetworkType(); method public int getDataNetworkType();
method public int getDataState(); method public int getDataState();

2
api/system-current.txt
View File

@ -43554,7 +43554,7 @@ package android.telephony {
method public java.lang.String getCdmaMdn(int); method public java.lang.String getCdmaMdn(int);
method public java.lang.String getCdmaMin(); method public java.lang.String getCdmaMin();
method public java.lang.String getCdmaMin(int); 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();
method public int getCurrentPhoneType(int); method public int getCurrentPhoneType(int);
method public int getDataActivity(); method public int getDataActivity();

2
api/test-current.txt
View File

@ -40284,7 +40284,7 @@ package android.telephony {
method public java.util.List<android.telephony.CellInfo> getAllCellInfo(); method public java.util.List<android.telephony.CellInfo> getAllCellInfo();
method public int getCallState(); method public int getCallState();
method public android.os.PersistableBundle getCarrierConfig(); 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 getDataActivity();
method public int getDataNetworkType(); method public int getDataNetworkType();
method public int getDataState(); method public int getDataState();

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

@ -1087,14 +1087,15 @@ public class TelephonyManager {
* this method will return null. The implementation must not to try add LTE * this method will return null. The implementation must not to try add LTE
* identifiers into the existing cdma/gsm classes. * identifiers into the existing cdma/gsm classes.
*<p> *<p>
* In the future this call will be deprecated.
*<p>
* @return Current location of the device or null if not available. * @return Current location of the device or null if not available.
* *
* <p>Requires Permission: * <p>Requires Permission:
* {@link android.Manifest.permission#ACCESS_COARSE_LOCATION ACCESS_COARSE_LOCATION} or * {@link android.Manifest.permission#ACCESS_COARSE_LOCATION ACCESS_COARSE_LOCATION} or
* {@link android.Manifest.permission#ACCESS_COARSE_LOCATION ACCESS_FINE_LOCATION}. * {@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() { public CellLocation getCellLocation() {
try { try {
ITelephony telephony = getITelephony(); ITelephony telephony = getITelephony();