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

Commit 8e62041b authored by yuemingw's avatar yuemingw Committed by android-build-merger
Browse files

Merge "Add public ApnSetting in android.telephony." am: f9063b37 am: f68992a6 

am: e3d4b7d3

Change-Id: Ia4100787507887692c6aa5df4e331fba59993255
parents 285b393c e3d4b7d3

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -618,6 +618,7 @@ java_library { 
        "android.hardware.vibrator-V1.0-java-constants",

        "android.hardware.vibrator-V1.1-java-constants",

        "android.hardware.wifi-V1.0-java-constants",

        "android.hardware.radio-V1.0-java",

    ],



    // Loaded with System.loadLibrary by android.view.textclassifier

api/current.txt

+72 −0
Original line number Diff line number Diff line
@@ -41613,6 +41613,78 @@ package android.telephony.cdma { 














}



























package android.telephony.data {

























  public class ApnSetting implements android.os.Parcelable {













    method public int describeContents();













    method public java.lang.String getApnName();













    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.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 java.lang.String getUser();













    method public boolean isEnabled();













    method public void writeToParcel(android.os.Parcel, int);













    field public static final int AUTH_TYPE_CHAP = 2; // 0x2













    field public static final int AUTH_TYPE_NONE = 0; // 0x0













    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";













  }

























  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 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 setId(int);













    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 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 setUser(java.lang.String);













  }

























}



























package android.telephony.gsm {





























  public class GsmCellLocation extends android.telephony.CellLocation {

























telephony/java/android/telephony/data/ApnSetting.aidl
0 → 100644



+18
−0






























Original line number
Diff line number
Diff line













/*













 * Copyright (C) 2018 The Android Open Source Project













 *













 * Licensed under the Apache License, Version 2.0 (the "License");













 * you may not use this file except in compliance with the License.













 * You may obtain a copy of the License at













 *













 *      http://www.apache.org/licenses/LICENSE-2.0













 *













 * Unless required by applicable law or agreed to in writing, software













 * distributed under the License is distributed on an "AS IS" BASIS,













 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.













 * See the License for the specific language governing permissions and













 * limitations under the License.













 */













package android.telephony.data;



























parcelable ApnSetting;
























telephony/java/android/telephony/data/ApnSetting.java
0 → 100644



+1370
−0




























File added.
Preview size limit exceeded, changes collapsed.
























Android.mk



+1
−1




























File changed.
Contains only whitespace changes.