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

Merge "Rollback @SystemApi on ApnSetting"

Browse Source
This commit is contained in:
Treehugger Robot
2020-03-13 20:58:11 +00:00
committed by Gerrit Code Review
parent ea4d3a958e 0663331688
commit f36f5590ac
2 changed files with 0 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
api/system-current.txt
View File

@@ -9614,23 +9614,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();

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

@@ -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;
@@ -147,7 +146,6 @@ public class ApnSetting implements Parcelable {
*
* @hide
*/
@SystemApi
public static final String TYPE_ALL_STRING = "*";
/**
@@ -155,7 +153,6 @@ public class ApnSetting implements Parcelable {
*
* @hide
*/
@SystemApi
public static final String TYPE_DEFAULT_STRING = "default";
@@ -164,7 +161,6 @@ public class ApnSetting implements Parcelable {
*
* @hide
*/
@SystemApi
public static final String TYPE_MMS_STRING = "mms";
@@ -173,7 +169,6 @@ public class ApnSetting implements Parcelable {
*
* @hide
*/
@SystemApi
public static final String TYPE_SUPL_STRING = "supl";
/**
@@ -181,7 +176,6 @@ public class ApnSetting implements Parcelable {
*
* @hide
*/
@SystemApi
public static final String TYPE_DUN_STRING = "dun";
/**
@@ -189,7 +183,6 @@ public class ApnSetting implements Parcelable {
*
* @hide
*/
@SystemApi
public static final String TYPE_HIPRI_STRING = "hipri";
/**
@@ -197,7 +190,6 @@ public class ApnSetting implements Parcelable {
*
* @hide
*/
@SystemApi
public static final String TYPE_FOTA_STRING = "fota";
/**
@@ -205,7 +197,6 @@ public class ApnSetting implements Parcelable {
*
* @hide
*/
@SystemApi
public static final String TYPE_IMS_STRING = "ims";
/**
@@ -213,7 +204,6 @@ public class ApnSetting implements Parcelable {
*
* @hide
*/
@SystemApi
public static final String TYPE_CBS_STRING = "cbs";
/**
@@ -221,7 +211,6 @@ public class ApnSetting implements Parcelable {
*
* @hide
*/
@SystemApi
public static final String TYPE_IA_STRING = "ia";
/**
@@ -230,7 +219,6 @@ public class ApnSetting implements Parcelable {
*
* @hide
*/
@SystemApi
public static final String TYPE_EMERGENCY_STRING = "emergency";
/**
@@ -238,7 +226,6 @@ public class ApnSetting implements Parcelable {
*
* @hide
*/
@SystemApi
public static final String TYPE_MCX_STRING = "mcx";
/**
@@ -246,7 +233,6 @@ public class ApnSetting implements Parcelable {
*
* @hide
*/
@SystemApi
public static final String TYPE_XCAP_STRING = "xcap";
@@ -1421,7 +1407,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<>();