Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e9763d3 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Remove internal ApnSetting." into pi-dev-plus-aosp am: 1969c54a"

parents 19117b46 0885b2d3

api/current.txt

+9 −5
Original line number Diff line number Diff line
@@ -42723,7 +42723,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();
@@ -42731,7 +42732,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();
@@ -42751,7 +42753,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
@@ -42770,7 +42772,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);
@@ -42778,7 +42781,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);

core/java/android/app/admin/DevicePolicyManager.java

+2 −2
Original line number Diff line number Diff line
@@ -9398,9 +9398,9 @@ public class DevicePolicyManager { 
     * <ul>

     *   <li>{@link ApnSetting#getOperatorNumeric()}</li>

     *   <li>{@link ApnSetting#getApnName()}</li>

     *   <li>{@link ApnSetting#getProxyAddress()}</li>

     *   <li>{@link ApnSetting#getProxyAddressAsString()}</li>

     *   <li>{@link ApnSetting#getProxyPort()}</li>

     *   <li>{@link ApnSetting#getMmsProxyAddress()}</li>

     *   <li>{@link ApnSetting#getMmsProxyAddressAsString()}</li>

     *   <li>{@link ApnSetting#getMmsProxyPort()}</li>

     *   <li>{@link ApnSetting#getMmsc()}</li>

     *   <li>{@link ApnSetting#isEnabled()}</li>

telephony/java/android/telephony/data/ApnSetting.java

+463 −124

File changed.

Preview size limit exceeded, changes collapsed.