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

Commit d8b1c8b2 authored by Daniel Bright's avatar Daniel Bright
Browse files

Rollback @SystemApi on ApnSetting 

* Remove @SystemApi from ApnSetting.TYPE_*
* Remove @SystemApi from ApnSetting.getApnTypesStringFromBitmask

Bug: 147465477
Test: make \ flash
Change-Id: Ifc781ae494968fbaad8c591dbd990d397e0d733b
parent 16c9fb8c

api/system-current.txt

+0 −17
Original line number Diff line number Diff line
@@ -11903,23 +11903,6 @@ package android.telephony.cdma { 














package android.telephony.data {



























  public class ApnSetting implements android.os.Parcelable {













    method @NonNull public static String getApnTypesStringFromBitmask(int);













    field public static final String TYPE_ALL_STRING = "*";













    field public static final String TYPE_CBS_STRING = "cbs";













    field public static final String TYPE_DEFAULT_STRING = "default";













    field public static final String TYPE_DUN_STRING = "dun";













    field public static final String TYPE_EMERGENCY_STRING = "emergency";













    field public static final String TYPE_FOTA_STRING = "fota";













    field public static final String TYPE_HIPRI_STRING = "hipri";













    field public static final String TYPE_IA_STRING = "ia";













    field public static final String TYPE_IMS_STRING = "ims";













    field public static final String TYPE_MCX_STRING = "mcx";













    field public static final String TYPE_MMS_STRING = "mms";













    field public static final String TYPE_SUPL_STRING = "supl";













    field public static final String TYPE_XCAP_STRING = "xcap";













  }



























  public final class DataCallResponse implements android.os.Parcelable {















    method public int describeContents();















    method @NonNull public java.util.List<android.net.LinkAddress> getAddresses();

























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



+0
−15




























Original line number
Diff line number
Diff line








@@ -18,7 +18,6 @@ package android.telephony.data;













import android.annotation.IntDef;















import android.annotation.NonNull;















import android.annotation.Nullable;













import android.annotation.SystemApi;















import android.content.ContentValues;















import android.database.Cursor;















import android.hardware.radio.V1_5.ApnTypes;










@@ -139,7 +138,6 @@ public class ApnSetting implements Parcelable {













     *















     * @hide















     */













    @SystemApi















    public static final String TYPE_ALL_STRING = "*";































    /**









@@ -147,7 +145,6 @@ public class ApnSetting implements Parcelable {













     *















     * @hide















     */













    @SystemApi















    public static final String TYPE_DEFAULT_STRING = "default";









































@@ -156,7 +153,6 @@ public class ApnSetting implements Parcelable {













     *















     * @hide















     */













    @SystemApi















    public static final String TYPE_MMS_STRING = "mms";









































@@ -165,7 +161,6 @@ public class ApnSetting implements Parcelable {













     *















     * @hide















     */













    @SystemApi















    public static final String TYPE_SUPL_STRING = "supl";































    /**









@@ -173,7 +168,6 @@ public class ApnSetting implements Parcelable {













     *















     * @hide















     */













    @SystemApi















    public static final String TYPE_DUN_STRING = "dun";































    /**









@@ -181,7 +175,6 @@ public class ApnSetting implements Parcelable {













     *















     * @hide















     */













    @SystemApi















    public static final String TYPE_HIPRI_STRING = "hipri";































    /**









@@ -189,7 +182,6 @@ public class ApnSetting implements Parcelable {













     *















     * @hide















     */













    @SystemApi















    public static final String TYPE_FOTA_STRING = "fota";































    /**









@@ -197,7 +189,6 @@ public class ApnSetting implements Parcelable {













     *















     * @hide















     */













    @SystemApi















    public static final String TYPE_IMS_STRING = "ims";































    /**









@@ -205,7 +196,6 @@ public class ApnSetting implements Parcelable {













     *















     * @hide















     */













    @SystemApi















    public static final String TYPE_CBS_STRING = "cbs";































    /**









@@ -213,7 +203,6 @@ public class ApnSetting implements Parcelable {













     *















     * @hide















     */













    @SystemApi















    public static final String TYPE_IA_STRING = "ia";































    /**









@@ -222,7 +211,6 @@ public class ApnSetting implements Parcelable {













     *















     * @hide















     */













    @SystemApi















    public static final String TYPE_EMERGENCY_STRING = "emergency";































    /**









@@ -230,7 +218,6 @@ public class ApnSetting implements Parcelable {













     *















     * @hide















     */













    @SystemApi















    public static final String TYPE_MCX_STRING = "mcx";































    /**









@@ -238,7 +225,6 @@ public class ApnSetting implements Parcelable {













     *















     * @hide















     */













    @SystemApi















    public static final String TYPE_XCAP_STRING = "xcap";










































@@ -1416,7 +1402,6 @@ public class ApnSetting implements Parcelable {













     * @return comma delimited list of APN types.















     * @hide















     */













    @SystemApi















    @NonNull















    public static String getApnTypesStringFromBitmask(int apnTypeBitmask) {















        List<String> types = new ArrayList<>();