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

Merge changes from topic "clean"

Browse Source 
am: 9f2362bb82

Change-Id: I9a0554d7cacd8c02d78ad08b7d05b074720dfe2a
This commit is contained in:
Pengquan Meng
2018-06-13 15:33:08 -07:00
committed by android-build-merger
parent 8efa35360f 9f2362bb82
commit fdad4c89fb
2 changed files with 598 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
api/current.txt
View File

@@ -42697,7 +42697,8 @@ package android.telephony.data {
method public int getAuthType();
method public java.lang.String getEntryName();
method public int getId();
method public java.net.InetAddress getMmsProxyAddress();
method public deprecated java.net.InetAddress getMmsProxyAddress();
method public java.lang.String getMmsProxyAddressAsString();
method public int getMmsProxyPort();
method public android.net.Uri getMmsc();
method public int getMvnoType();
@@ -42705,7 +42706,8 @@ package android.telephony.data {
method public java.lang.String getOperatorNumeric();
method public java.lang.String getPassword();
method public int getProtocol();
method public java.net.InetAddress getProxyAddress();
method public deprecated java.net.InetAddress getProxyAddress();
method public java.lang.String getProxyAddressAsString();
method public int getProxyPort();
method public int getRoamingProtocol();
method public java.lang.String getUser();
@@ -42725,7 +42727,7 @@ package android.telephony.data {
field public static final int PROTOCOL_IPV6 = 1; // 0x1
field public static final int PROTOCOL_PPP = 3; // 0x3
field public static final int TYPE_CBS = 128; // 0x80
field public static final int TYPE_DEFAULT = 17; // 0x11
field public static final int TYPE_DEFAULT = 1; // 0x1
field public static final int TYPE_DUN = 8; // 0x8
field public static final int TYPE_EMERGENCY = 512; // 0x200
field public static final int TYPE_FOTA = 32; // 0x20
@@ -42744,7 +42746,8 @@ package android.telephony.data {
method public android.telephony.data.ApnSetting.Builder setAuthType(int);
method public android.telephony.data.ApnSetting.Builder setCarrierEnabled(boolean);
method public android.telephony.data.ApnSetting.Builder setEntryName(java.lang.String);
method public android.telephony.data.ApnSetting.Builder setMmsProxyAddress(java.net.InetAddress);
method public deprecated android.telephony.data.ApnSetting.Builder setMmsProxyAddress(java.net.InetAddress);
method public android.telephony.data.ApnSetting.Builder setMmsProxyAddress(java.lang.String);
method public android.telephony.data.ApnSetting.Builder setMmsProxyPort(int);
method public android.telephony.data.ApnSetting.Builder setMmsc(android.net.Uri);
method public android.telephony.data.ApnSetting.Builder setMvnoType(int);
@@ -42752,7 +42755,8 @@ package android.telephony.data {
method public android.telephony.data.ApnSetting.Builder setOperatorNumeric(java.lang.String);
method public android.telephony.data.ApnSetting.Builder setPassword(java.lang.String);
method public android.telephony.data.ApnSetting.Builder setProtocol(int);
method public android.telephony.data.ApnSetting.Builder setProxyAddress(java.net.InetAddress);
method public deprecated android.telephony.data.ApnSetting.Builder setProxyAddress(java.net.InetAddress);
method public android.telephony.data.ApnSetting.Builder setProxyAddress(java.lang.String);
method public android.telephony.data.ApnSetting.Builder setProxyPort(int);
method public android.telephony.data.ApnSetting.Builder setRoamingProtocol(int);
method public android.telephony.data.ApnSetting.Builder setUser(java.lang.String);

840
telephony/java/android/telephony/data/ApnSetting.java
View File

File diff suppressed because it is too large Load Diff