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

Merge "Better javadoc and rename several methods in ApnSetting." into pi-dev

Browse Source 
am: 5d5d6aa28a

Change-Id: Ifaae67cd03bd979e3aeb40f3a077bdb36d5911e6
This commit is contained in:
yuemingw
2018-03-21 02:51:18 +00:00
committed by android-build-merger
parent d559bd176e 5d5d6aa28a
commit e31dd1fe95
3 changed files with 421 additions and 408 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
api/current.txt
View File

@@ -43354,21 +43354,21 @@ package android.telephony.data {
public class ApnSetting implements android.os.Parcelable {
method public int describeContents();
method public java.lang.String getApnName();
method public int getApnTypeBitmask();
method public int getAuthType();
method public java.lang.String getEntryName();
method public int getId();
method public int getMmsPort();
method public java.net.InetAddress getMmsProxy();
method public java.net.URL getMmsc();
method public java.lang.String getMvnoType();
method public java.net.InetAddress getMmsProxyAddress();
method public int getMmsProxyPort();
method public android.net.Uri getMmsc();
method public int getMvnoType();
method public int getNetworkTypeBitmask();
method public java.lang.String getOperatorNumeric();
method public java.lang.String getPassword();
method public int getPort();
method public java.lang.String getProtocol();
method public java.net.InetAddress getProxy();
method public java.lang.String getRoamingProtocol();
method public java.util.List<java.lang.String> getTypes();
method public int getProtocol();
method public java.net.InetAddress getProxyAddress();
method public int getProxyPort();
method public int getRoamingProtocol();
method public java.lang.String getUser();
method public boolean isEnabled();
method public void writeToParcel(android.os.Parcel, int);
@@ -43377,46 +43377,45 @@ package android.telephony.data {
field public static final int AUTH_TYPE_PAP = 1; // 0x1
field public static final int AUTH_TYPE_PAP_OR_CHAP = 3; // 0x3
field public static final android.os.Parcelable.Creator<android.telephony.data.ApnSetting> CREATOR;
field public static final java.lang.String MVNO_TYPE_GID = "gid";
field public static final java.lang.String MVNO_TYPE_ICCID = "iccid";
field public static final java.lang.String MVNO_TYPE_IMSI = "imsi";
field public static final java.lang.String MVNO_TYPE_SPN = "spn";
field public static final java.lang.String PROTOCOL_IP = "IP";
field public static final java.lang.String PROTOCOL_IPV4V6 = "IPV4V6";
field public static final java.lang.String PROTOCOL_IPV6 = "IPV6";
field public static final java.lang.String PROTOCOL_PPP = "PPP";
field public static final java.lang.String TYPE_ALL = "*";
field public static final java.lang.String TYPE_CBS = "cbs";
field public static final java.lang.String TYPE_DEFAULT = "default";
field public static final java.lang.String TYPE_DUN = "dun";
field public static final java.lang.String TYPE_EMERGENCY = "emergency";
field public static final java.lang.String TYPE_FOTA = "fota";
field public static final java.lang.String TYPE_HIPRI = "hipri";
field public static final java.lang.String TYPE_IA = "ia";
field public static final java.lang.String TYPE_IMS = "ims";
field public static final java.lang.String TYPE_MMS = "mms";
field public static final java.lang.String TYPE_SUPL = "supl";
field public static final int MVNO_TYPE_GID = 2; // 0x2
field public static final int MVNO_TYPE_ICCID = 3; // 0x3
field public static final int MVNO_TYPE_IMSI = 1; // 0x1
field public static final int MVNO_TYPE_SPN = 0; // 0x0
field public static final int PROTOCOL_IP = 0; // 0x0
field public static final int PROTOCOL_IPV4V6 = 2; // 0x2
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_DUN = 8; // 0x8
field public static final int TYPE_EMERGENCY = 512; // 0x200
field public static final int TYPE_FOTA = 32; // 0x20
field public static final int TYPE_HIPRI = 16; // 0x10
field public static final int TYPE_IA = 256; // 0x100
field public static final int TYPE_IMS = 64; // 0x40
field public static final int TYPE_MMS = 2; // 0x2
field public static final int TYPE_SUPL = 4; // 0x4
}
public static class ApnSetting.Builder {
ctor public ApnSetting.Builder();
method public android.telephony.data.ApnSetting build();
method public android.telephony.data.ApnSetting.Builder setApnName(java.lang.String);
method public android.telephony.data.ApnSetting.Builder setApnTypeBitmask(int);
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 setMmsPort(int);
method public android.telephony.data.ApnSetting.Builder setMmsProxy(java.net.InetAddress);
method public android.telephony.data.ApnSetting.Builder setMmsc(java.net.URL);
method public android.telephony.data.ApnSetting.Builder setMvnoType(java.lang.String);
method public android.telephony.data.ApnSetting.Builder setMmsProxyAddress(java.net.InetAddress);
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);
method public android.telephony.data.ApnSetting.Builder setNetworkTypeBitmask(int);
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 setPort(int);
method public android.telephony.data.ApnSetting.Builder setProtocol(java.lang.String);
method public android.telephony.data.ApnSetting.Builder setProxy(java.net.InetAddress);
method public android.telephony.data.ApnSetting.Builder setRoamingProtocol(java.lang.String);
method public android.telephony.data.ApnSetting.Builder setTypes(java.util.List<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 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);
}

6
services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java
View File

@@ -4738,7 +4738,11 @@ public class DevicePolicyManagerTest extends DpmTestBase {
public void testOverrideApnAPIsFailWithPO() throws Exception {
setupProfileOwner();
ApnSetting apn = (new ApnSetting.Builder()).build();
ApnSetting apn = (new ApnSetting.Builder())
.setApnName("test")
.setEntryName("test")
.setApnTypeBitmask(ApnSetting.TYPE_DEFAULT)
.build();
assertExpectException(SecurityException.class, null, () ->
dpm.addOverrideApn(admin1, apn));
assertExpectException(SecurityException.class, null, () ->

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

File diff suppressed because it is too large Load Diff