diff options
| -rwxr-xr-x | api/system-current.txt | 14 | ||||
| -rw-r--r-- | telephony/java/android/telephony/CdmaEriInformation.java | 1 | ||||
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 1 |
3 files changed, 0 insertions, 16 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 25f16d3c99fc..49a2b14e2bb3 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -10911,19 +10911,6 @@ package android.telephony { method @NonNull public java.util.List<android.telephony.CbGeoUtils.LatLng> getVertices(); } - public final class CdmaEriInformation implements android.os.Parcelable { - method public int describeContents(); - method public int getEriIconIndex(); - method public int getEriIconMode(); - method public void writeToParcel(@NonNull android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator<android.telephony.CdmaEriInformation> CREATOR; - field public static final int ERI_FLASH = 2; // 0x2 - field public static final int ERI_ICON_MODE_FLASH = 1; // 0x1 - field public static final int ERI_ICON_MODE_NORMAL = 0; // 0x0 - field public static final int ERI_OFF = 1; // 0x1 - field public static final int ERI_ON = 0; // 0x0 - } - public class CellBroadcastIntents { method public static void sendSmsCbReceivedBroadcast(@NonNull android.content.Context, @Nullable android.os.UserHandle, @NonNull android.telephony.SmsCbMessage, @Nullable android.content.BroadcastReceiver, @Nullable android.os.Handler, int, int); field public static final String ACTION_AREA_INFO_UPDATED = "android.telephony.action.AREA_INFO_UPDATED"; @@ -11619,7 +11606,6 @@ package android.telephony { method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getCarrierPrivilegeStatus(int); method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public java.util.List<java.lang.String> getCarrierPrivilegedPackagesForAllActiveSubscriptions(); method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public android.telephony.CarrierRestrictionRules getCarrierRestrictionRules(); - method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public android.telephony.CdmaEriInformation getCdmaEriInformation(); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public String getCdmaMdn(); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public String getCdmaMdn(int); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public String getCdmaMin(); diff --git a/telephony/java/android/telephony/CdmaEriInformation.java b/telephony/java/android/telephony/CdmaEriInformation.java index 1cd9d3048526..fd0b905e9c3e 100644 --- a/telephony/java/android/telephony/CdmaEriInformation.java +++ b/telephony/java/android/telephony/CdmaEriInformation.java @@ -40,7 +40,6 @@ import java.lang.annotation.RetentionPolicy; * * @hide */ -@SystemApi public final class CdmaEriInformation implements Parcelable { /** @hide */ @Retention(RetentionPolicy.SOURCE) diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 3c40e35c03e5..23a2b9cae125 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -5606,7 +5606,6 @@ public class TelephonyManager { * @hide */ @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) - @SystemApi @NonNull public CdmaEriInformation getCdmaEriInformation() { return new CdmaEriInformation( |