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

Merge "Deprecate getNetworkType"

Browse Source 
am: d47ae01063

Change-Id: I1b0fa0da19df09fbf980074ea097f19698c02ba6
This commit is contained in:
Nathan Harold
2019-05-27 14:29:22 -07:00
committed by android-build-merger
parent ab5273d7ce d47ae01063
commit 40ae3d6281
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -43064,7 +43064,7 @@ package android.telephony {
method public String getNetworkOperator(); method public String getNetworkOperator();
method public String getNetworkOperatorName(); method public String getNetworkOperatorName();
method public String getNetworkSpecifier(); method public String getNetworkSpecifier();
method public int getNetworkType(); method @Deprecated @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public int getNetworkType();
method public int getPhoneCount(); method public int getPhoneCount();
method public int getPhoneType(); method public int getPhoneType();
method @RequiresPermission(anyOf={"android.permission.READ_PRIVILEGED_PHONE_STATE", android.Manifest.permission.READ_PHONE_STATE}) public int getPreferredOpportunisticDataSubscription(); method @RequiresPermission(anyOf={"android.permission.READ_PRIVILEGED_PHONE_STATE", android.Manifest.permission.READ_PHONE_STATE}) public int getPreferredOpportunisticDataSubscription();

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

@@ -2409,8 +2409,13 @@ public class TelephonyManager {
public @interface NetworkType{} public @interface NetworkType{}
/** /**
* Return the current data network type.
*
* @deprecated use {@link #getDataNetworkType()}
* @return the NETWORK_TYPE_xxxx for current data connection. * @return the NETWORK_TYPE_xxxx for current data connection.
*/ */
@Deprecated
@RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)
public @NetworkType int getNetworkType() { public @NetworkType int getNetworkType() {
return getNetworkType(getSubId(SubscriptionManager.getDefaultDataSubscriptionId())); return getNetworkType(getSubId(SubscriptionManager.getDefaultDataSubscriptionId()));
} }