diff options
| -rw-r--r-- | api/current.txt | 8 | ||||
| -rwxr-xr-x | api/system-current.txt | 46 | ||||
| -rw-r--r-- | api/test-current.txt | 37 | ||||
| -rw-r--r-- | core/java/android/content/Context.java | 1 | ||||
| -rw-r--r-- | core/java/android/telephony/TelephonyRegistryManager.java | 1 | ||||
| -rw-r--r-- | telephony/api/system-current.txt | 45 | ||||
| -rw-r--r-- | telephony/java/android/telephony/CellSignalStrength.java | 2 | ||||
| -rw-r--r-- | telephony/java/android/telephony/ModemActivityInfo.java | 2 | ||||
| -rw-r--r-- | telephony/java/android/telephony/PhoneCapability.java | 2 | ||||
| -rw-r--r-- | telephony/java/android/telephony/ServiceState.java | 2 | ||||
| -rw-r--r-- | telephony/java/android/telephony/SignalStrength.java | 2 | ||||
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 17 |
12 files changed, 6 insertions, 159 deletions
diff --git a/api/current.txt b/api/current.txt index 26d91f47dd82..8a6bfa3c9984 100644 --- a/api/current.txt +++ b/api/current.txt @@ -46996,7 +46996,6 @@ package android.telephony { method public abstract int getAsuLevel(); method public abstract int getDbm(); method @IntRange(from=android.telephony.CellSignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN, to=android.telephony.CellSignalStrength.SIGNAL_STRENGTH_GREAT) public abstract int getLevel(); - method public static final int getNumSignalStrengthLevels(); method public abstract int hashCode(); field public static final int SIGNAL_STRENGTH_GOOD = 3; // 0x3 field public static final int SIGNAL_STRENGTH_GREAT = 4; // 0x4 @@ -47577,12 +47576,6 @@ package android.telephony { field public static final int SCAN_TYPE_PERIODIC = 1; // 0x1 } - public final class PhoneCapability implements android.os.Parcelable { - method public int describeContents(); - method public void writeToParcel(@NonNull android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator<android.telephony.PhoneCapability> CREATOR; - } - public class PhoneNumberFormattingTextWatcher implements android.text.TextWatcher { ctor public PhoneNumberFormattingTextWatcher(); ctor public PhoneNumberFormattingTextWatcher(String); @@ -48106,7 +48099,6 @@ package android.telephony { method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public boolean doesSwitchMultiSimConfigTriggerReboot(); method public int getActiveModemCount(); method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public java.util.List<android.telephony.CellInfo> getAllCellInfo(); - method @NonNull public static int[] getAllNetworkTypes(); method public int getCallState(); method public int getCardIdForDefaultEuicc(); method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) @WorkerThread public android.os.PersistableBundle getCarrierConfig(); diff --git a/api/system-current.txt b/api/system-current.txt index 6e336a80a995..5a0d0a139a2b 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -1804,7 +1804,6 @@ package android.content { field public static final String STATUS_BAR_SERVICE = "statusbar"; field public static final String SYSTEM_CONFIG_SERVICE = "system_config"; field public static final String SYSTEM_UPDATE_SERVICE = "system_update"; - field public static final String TELEPHONY_REGISTRY_SERVICE = "telephony_registry"; field public static final String TETHERING_SERVICE = "tethering"; field public static final String VR_SERVICE = "vrmanager"; field public static final String WIFI_NL80211_SERVICE = "wifinl80211"; @@ -10891,30 +10890,6 @@ package android.telephony { field public static final String MBMS_STREAMING_SERVICE_ACTION = "android.telephony.action.EmbmsStreaming"; } - public final class ModemActivityInfo implements android.os.Parcelable { - ctor public ModemActivityInfo(long, int, int, @NonNull int[], int); - method public int describeContents(); - method public int getIdleTimeMillis(); - method public int getReceiveTimeMillis(); - method public int getSleepTimeMillis(); - method public long getTimestamp(); - method @NonNull public java.util.List<android.telephony.ModemActivityInfo.TransmitPower> getTransmitPowerInfo(); - method public boolean isValid(); - method public void writeToParcel(android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator<android.telephony.ModemActivityInfo> CREATOR; - field public static final int TX_POWER_LEVELS = 5; // 0x5 - field public static final int TX_POWER_LEVEL_0 = 0; // 0x0 - field public static final int TX_POWER_LEVEL_1 = 1; // 0x1 - field public static final int TX_POWER_LEVEL_2 = 2; // 0x2 - field public static final int TX_POWER_LEVEL_3 = 3; // 0x3 - field public static final int TX_POWER_LEVEL_4 = 4; // 0x4 - } - - public class ModemActivityInfo.TransmitPower { - method @NonNull public android.util.Range<java.lang.Integer> getPowerRangeInDbm(); - method public int getTimeInMillis(); - } - public final class NetworkRegistrationInfo implements android.os.Parcelable { method @Nullable public android.telephony.DataSpecificRegistrationInfo getDataSpecificInfo(); method public int getRegistrationState(); @@ -11139,21 +11114,15 @@ package android.telephony { } public class ServiceState implements android.os.Parcelable { - method public void fillInNotifierBundle(@NonNull android.os.Bundle); method @Nullable public android.telephony.NetworkRegistrationInfo getNetworkRegistrationInfo(int, int); method @NonNull public java.util.List<android.telephony.NetworkRegistrationInfo> getNetworkRegistrationInfoListForDomain(int); method @NonNull public java.util.List<android.telephony.NetworkRegistrationInfo> getNetworkRegistrationInfoListForTransportType(int); - method @NonNull public static android.telephony.ServiceState newFromBundle(@NonNull android.os.Bundle); field public static final int ROAMING_TYPE_DOMESTIC = 2; // 0x2 field public static final int ROAMING_TYPE_INTERNATIONAL = 3; // 0x3 field public static final int ROAMING_TYPE_NOT_ROAMING = 0; // 0x0 field public static final int ROAMING_TYPE_UNKNOWN = 1; // 0x1 } - public class SignalStrength implements android.os.Parcelable { - ctor public SignalStrength(@NonNull android.telephony.SignalStrength); - } - public final class SmsCbCmasInfo implements android.os.Parcelable { ctor public SmsCbCmasInfo(int, int, int, int, int, int); method public int describeContents(); @@ -11431,7 +11400,6 @@ package android.telephony { method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isDataEnabledForApn(int); method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isEmergencyAssistanceEnabled(); method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isIdle(); - method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isInEmergencySmsMode(); method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isLteCdmaEvdoGsmWcdmaEnabled(); method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isOffhook(); method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isOpportunisticNetworkEnabled(); @@ -11483,11 +11451,6 @@ package android.telephony { method @RequiresPermission(android.Manifest.permission.READ_ACTIVE_EMERGENCY_SESSION) public void updateOtaEmergencyNumberDbFilePath(@NonNull android.os.ParcelFileDescriptor); method public void updateServiceLocation(); field @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public static final String ACTION_ANOMALY_REPORTED = "android.telephony.action.ANOMALY_REPORTED"; - field public static final String ACTION_CARRIER_SIGNAL_DEFAULT_NETWORK_AVAILABLE = "com.android.internal.telephony.CARRIER_SIGNAL_DEFAULT_NETWORK_AVAILABLE"; - field public static final String ACTION_CARRIER_SIGNAL_PCO_VALUE = "com.android.internal.telephony.CARRIER_SIGNAL_PCO_VALUE"; - field public static final String ACTION_CARRIER_SIGNAL_REDIRECTED = "com.android.internal.telephony.CARRIER_SIGNAL_REDIRECTED"; - field public static final String ACTION_CARRIER_SIGNAL_REQUEST_NETWORK_FAILED = "com.android.internal.telephony.CARRIER_SIGNAL_REQUEST_NETWORK_FAILED"; - field public static final String ACTION_CARRIER_SIGNAL_RESET = "com.android.internal.telephony.CARRIER_SIGNAL_RESET"; field public static final String ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED = "android.intent.action.ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED"; field public static final String ACTION_DEFAULT_VOICE_SUBSCRIPTION_CHANGED = "android.intent.action.ACTION_DEFAULT_VOICE_SUBSCRIPTION_CHANGED"; field public static final String ACTION_EMERGENCY_ASSISTANCE = "android.telephony.action.EMERGENCY_ASSISTANCE"; @@ -11504,17 +11467,8 @@ package android.telephony { field public static final int CARRIER_PRIVILEGE_STATUS_RULES_NOT_LOADED = -1; // 0xffffffff field public static final String EXTRA_ANOMALY_DESCRIPTION = "android.telephony.extra.ANOMALY_DESCRIPTION"; field public static final String EXTRA_ANOMALY_ID = "android.telephony.extra.ANOMALY_ID"; - field @Deprecated public static final String EXTRA_APN_PROTOCOL = "apnProto"; - field public static final String EXTRA_APN_PROTOCOL_INT = "apnProtoInt"; - field @Deprecated public static final String EXTRA_APN_TYPE = "apnType"; - field public static final String EXTRA_APN_TYPE_INT = "apnTypeInt"; - field public static final String EXTRA_DEFAULT_NETWORK_AVAILABLE = "defaultNetworkAvailable"; - field public static final String EXTRA_ERROR_CODE = "errorCode"; - field public static final String EXTRA_PCO_ID = "pcoId"; - field public static final String EXTRA_PCO_VALUE = "pcoValue"; field public static final String EXTRA_PHONE_IN_ECM_STATE = "android.telephony.extra.PHONE_IN_ECM_STATE"; field public static final String EXTRA_PHONE_IN_EMERGENCY_CALL = "android.telephony.extra.PHONE_IN_EMERGENCY_CALL"; - field public static final String EXTRA_REDIRECTION_URL = "redirectionUrl"; field public static final String EXTRA_SIM_STATE = "android.telephony.extra.SIM_STATE"; field public static final String EXTRA_VISUAL_VOICEMAIL_ENABLED_BY_USER_BOOL = "android.telephony.extra.VISUAL_VOICEMAIL_ENABLED_BY_USER_BOOL"; field public static final String EXTRA_VOICEMAIL_SCRAMBLED_PIN_STRING = "android.telephony.extra.VOICEMAIL_SCRAMBLED_PIN_STRING"; diff --git a/api/test-current.txt b/api/test-current.txt index 3586fec6e948..f113dd16272c 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -3801,43 +3801,6 @@ package android.telephony { field public static final int UNKNOWN_CARRIER_ID_LIST_VERSION = -1; // 0xffffffff } - public class TelephonyRegistryManager { - method public void addOnOpportunisticSubscriptionsChangedListener(@NonNull android.telephony.SubscriptionManager.OnOpportunisticSubscriptionsChangedListener, @NonNull java.util.concurrent.Executor); - method public void addOnSubscriptionsChangedListener(@NonNull android.telephony.SubscriptionManager.OnSubscriptionsChangedListener, @NonNull java.util.concurrent.Executor); - method public void listenForSubscriber(int, @NonNull String, @NonNull String, @NonNull android.telephony.PhoneStateListener, int, boolean); - method public void notifyActiveDataSubIdChanged(int); - method public void notifyBarringInfoChanged(int, int, @NonNull android.telephony.BarringInfo); - method public void notifyCallForwardingChanged(int, boolean); - method public void notifyCallQualityChanged(int, int, @NonNull android.telephony.CallQuality, int); - method public void notifyCallStateChanged(int, int, int, @Nullable String); - method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void notifyCallStateChangedForAllSubscriptions(int, @Nullable String); - method public void notifyCarrierNetworkChange(boolean); - method public void notifyCellInfoChanged(int, @NonNull java.util.List<android.telephony.CellInfo>); - method public void notifyCellLocation(int, @NonNull android.telephony.CellIdentity); - method public void notifyDataActivationStateChanged(int, int, int); - method public void notifyDataActivityChanged(int, int); - method public void notifyDataConnectionForSubscriber(int, int, int, @Nullable android.telephony.PreciseDataConnectionState); - method public void notifyDisconnectCause(int, int, int, int); - method public void notifyDisplayInfoChanged(int, int, @NonNull android.telephony.TelephonyDisplayInfo); - method public void notifyEmergencyNumberList(int, int); - method public void notifyImsDisconnectCause(int, @NonNull android.telephony.ims.ImsReasonInfo); - method public void notifyMessageWaitingChanged(int, int, boolean); - method public void notifyOutgoingEmergencyCall(int, int, @NonNull android.telephony.emergency.EmergencyNumber); - method public void notifyOutgoingEmergencySms(int, int, @NonNull android.telephony.emergency.EmergencyNumber); - method public void notifyPhoneCapabilityChanged(@NonNull android.telephony.PhoneCapability); - method public void notifyPreciseCallState(int, int, int, int, int); - method public void notifyPreciseDataConnectionFailed(int, int, int, @Nullable String, int); - method public void notifyRadioPowerStateChanged(int, int, int); - method public void notifyRegistrationFailed(int, int, @NonNull android.telephony.CellIdentity, @NonNull String, int, int, int); - method public void notifyServiceStateChanged(int, int, @NonNull android.telephony.ServiceState); - method public void notifySignalStrengthChanged(int, int, @NonNull android.telephony.SignalStrength); - method public void notifySrvccStateChanged(int, int); - method public void notifyUserMobileDataStateChanged(int, int, boolean); - method public void notifyVoiceActivationStateChanged(int, int, int); - method public void removeOnOpportunisticSubscriptionsChangedListener(@NonNull android.telephony.SubscriptionManager.OnOpportunisticSubscriptionsChangedListener); - method public void removeOnSubscriptionsChangedListener(@NonNull android.telephony.SubscriptionManager.OnSubscriptionsChangedListener); - } - } package android.telephony.emergency { diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index 6f4606659c3e..413fef755209 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -5104,7 +5104,6 @@ public abstract class Context { * {@link TelephonyRegistryManager}. * @hide */ - @SystemApi public static final String TELEPHONY_REGISTRY_SERVICE = "telephony_registry"; /** diff --git a/core/java/android/telephony/TelephonyRegistryManager.java b/core/java/android/telephony/TelephonyRegistryManager.java index 21d16f64d2b3..0854452e6886 100644 --- a/core/java/android/telephony/TelephonyRegistryManager.java +++ b/core/java/android/telephony/TelephonyRegistryManager.java @@ -61,7 +61,6 @@ import java.util.concurrent.Executor; * * @hide */ -@TestApi public class TelephonyRegistryManager { private static final String TAG = "TelephonyRegistryManager"; diff --git a/telephony/api/system-current.txt b/telephony/api/system-current.txt index 959d1092d111..ac0caf16f9a0 100644 --- a/telephony/api/system-current.txt +++ b/telephony/api/system-current.txt @@ -290,30 +290,6 @@ package android.telephony { field public static final String MBMS_STREAMING_SERVICE_ACTION = "android.telephony.action.EmbmsStreaming"; } - public final class ModemActivityInfo implements android.os.Parcelable { - ctor public ModemActivityInfo(long, int, int, @NonNull int[], int); - method public int describeContents(); - method public int getIdleTimeMillis(); - method public int getReceiveTimeMillis(); - method public int getSleepTimeMillis(); - method public long getTimestamp(); - method @NonNull public java.util.List<android.telephony.ModemActivityInfo.TransmitPower> getTransmitPowerInfo(); - method public boolean isValid(); - method public void writeToParcel(android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator<android.telephony.ModemActivityInfo> CREATOR; - field public static final int TX_POWER_LEVELS = 5; // 0x5 - field public static final int TX_POWER_LEVEL_0 = 0; // 0x0 - field public static final int TX_POWER_LEVEL_1 = 1; // 0x1 - field public static final int TX_POWER_LEVEL_2 = 2; // 0x2 - field public static final int TX_POWER_LEVEL_3 = 3; // 0x3 - field public static final int TX_POWER_LEVEL_4 = 4; // 0x4 - } - - public class ModemActivityInfo.TransmitPower { - method @NonNull public android.util.Range<java.lang.Integer> getPowerRangeInDbm(); - method public int getTimeInMillis(); - } - public final class NetworkRegistrationInfo implements android.os.Parcelable { method @Nullable public android.telephony.DataSpecificRegistrationInfo getDataSpecificInfo(); method public int getRegistrationState(); @@ -521,21 +497,15 @@ package android.telephony { } public class ServiceState implements android.os.Parcelable { - method public void fillInNotifierBundle(@NonNull android.os.Bundle); method @Nullable public android.telephony.NetworkRegistrationInfo getNetworkRegistrationInfo(int, int); method @NonNull public java.util.List<android.telephony.NetworkRegistrationInfo> getNetworkRegistrationInfoListForDomain(int); method @NonNull public java.util.List<android.telephony.NetworkRegistrationInfo> getNetworkRegistrationInfoListForTransportType(int); - method @NonNull public static android.telephony.ServiceState newFromBundle(@NonNull android.os.Bundle); field public static final int ROAMING_TYPE_DOMESTIC = 2; // 0x2 field public static final int ROAMING_TYPE_INTERNATIONAL = 3; // 0x3 field public static final int ROAMING_TYPE_NOT_ROAMING = 0; // 0x0 field public static final int ROAMING_TYPE_UNKNOWN = 1; // 0x1 } - public class SignalStrength implements android.os.Parcelable { - ctor public SignalStrength(@NonNull android.telephony.SignalStrength); - } - public final class SmsCbCmasInfo implements android.os.Parcelable { ctor public SmsCbCmasInfo(int, int, int, int, int, int); method public int describeContents(); @@ -807,7 +777,6 @@ package android.telephony { method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isDataEnabledForApn(int); method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isEmergencyAssistanceEnabled(); method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isIdle(); - method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isInEmergencySmsMode(); method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isLteCdmaEvdoGsmWcdmaEnabled(); method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isOffhook(); method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isOpportunisticNetworkEnabled(); @@ -859,11 +828,6 @@ package android.telephony { method @RequiresPermission(android.Manifest.permission.READ_ACTIVE_EMERGENCY_SESSION) public void updateOtaEmergencyNumberDbFilePath(@NonNull android.os.ParcelFileDescriptor); method public void updateServiceLocation(); field @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public static final String ACTION_ANOMALY_REPORTED = "android.telephony.action.ANOMALY_REPORTED"; - field public static final String ACTION_CARRIER_SIGNAL_DEFAULT_NETWORK_AVAILABLE = "com.android.internal.telephony.CARRIER_SIGNAL_DEFAULT_NETWORK_AVAILABLE"; - field public static final String ACTION_CARRIER_SIGNAL_PCO_VALUE = "com.android.internal.telephony.CARRIER_SIGNAL_PCO_VALUE"; - field public static final String ACTION_CARRIER_SIGNAL_REDIRECTED = "com.android.internal.telephony.CARRIER_SIGNAL_REDIRECTED"; - field public static final String ACTION_CARRIER_SIGNAL_REQUEST_NETWORK_FAILED = "com.android.internal.telephony.CARRIER_SIGNAL_REQUEST_NETWORK_FAILED"; - field public static final String ACTION_CARRIER_SIGNAL_RESET = "com.android.internal.telephony.CARRIER_SIGNAL_RESET"; field public static final String ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED = "android.intent.action.ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED"; field public static final String ACTION_DEFAULT_VOICE_SUBSCRIPTION_CHANGED = "android.intent.action.ACTION_DEFAULT_VOICE_SUBSCRIPTION_CHANGED"; field public static final String ACTION_EMERGENCY_ASSISTANCE = "android.telephony.action.EMERGENCY_ASSISTANCE"; @@ -880,17 +844,8 @@ package android.telephony { field public static final int CARRIER_PRIVILEGE_STATUS_RULES_NOT_LOADED = -1; // 0xffffffff field public static final String EXTRA_ANOMALY_DESCRIPTION = "android.telephony.extra.ANOMALY_DESCRIPTION"; field public static final String EXTRA_ANOMALY_ID = "android.telephony.extra.ANOMALY_ID"; - field @Deprecated public static final String EXTRA_APN_PROTOCOL = "apnProto"; - field public static final String EXTRA_APN_PROTOCOL_INT = "apnProtoInt"; - field @Deprecated public static final String EXTRA_APN_TYPE = "apnType"; - field public static final String EXTRA_APN_TYPE_INT = "apnTypeInt"; - field public static final String EXTRA_DEFAULT_NETWORK_AVAILABLE = "defaultNetworkAvailable"; - field public static final String EXTRA_ERROR_CODE = "errorCode"; - field public static final String EXTRA_PCO_ID = "pcoId"; - field public static final String EXTRA_PCO_VALUE = "pcoValue"; field public static final String EXTRA_PHONE_IN_ECM_STATE = "android.telephony.extra.PHONE_IN_ECM_STATE"; field public static final String EXTRA_PHONE_IN_EMERGENCY_CALL = "android.telephony.extra.PHONE_IN_EMERGENCY_CALL"; - field public static final String EXTRA_REDIRECTION_URL = "redirectionUrl"; field public static final String EXTRA_SIM_STATE = "android.telephony.extra.SIM_STATE"; field public static final String EXTRA_VISUAL_VOICEMAIL_ENABLED_BY_USER_BOOL = "android.telephony.extra.VISUAL_VOICEMAIL_ENABLED_BY_USER_BOOL"; field public static final String EXTRA_VOICEMAIL_SCRAMBLED_PIN_STRING = "android.telephony.extra.VOICEMAIL_SCRAMBLED_PIN_STRING"; diff --git a/telephony/java/android/telephony/CellSignalStrength.java b/telephony/java/android/telephony/CellSignalStrength.java index cb8fdf0141b8..2e7bde3b3d89 100644 --- a/telephony/java/android/telephony/CellSignalStrength.java +++ b/telephony/java/android/telephony/CellSignalStrength.java @@ -156,6 +156,8 @@ public abstract class CellSignalStrength { /** * Returns the number of signal strength levels. * @return Number of signal strength levels, enforced to be 5 + * + * @hide */ public static final int getNumSignalStrengthLevels() { return NUM_SIGNAL_STRENGTH_BINS; diff --git a/telephony/java/android/telephony/ModemActivityInfo.java b/telephony/java/android/telephony/ModemActivityInfo.java index e815aec017a1..2b72ab7635c3 100644 --- a/telephony/java/android/telephony/ModemActivityInfo.java +++ b/telephony/java/android/telephony/ModemActivityInfo.java @@ -18,7 +18,6 @@ package android.telephony; import android.annotation.IntDef; import android.annotation.NonNull; -import android.annotation.SystemApi; import android.os.Parcel; import android.os.Parcelable; import android.os.SystemClock; @@ -33,7 +32,6 @@ import java.util.List; * Reports modem activity information. * @hide */ -@SystemApi public final class ModemActivityInfo implements Parcelable { /** * Tx(transmit) power level. see power index below diff --git a/telephony/java/android/telephony/PhoneCapability.java b/telephony/java/android/telephony/PhoneCapability.java index 6571858fc4ae..b785037e51c1 100644 --- a/telephony/java/android/telephony/PhoneCapability.java +++ b/telephony/java/android/telephony/PhoneCapability.java @@ -28,6 +28,8 @@ import java.util.Objects; /** * Define capability of a modem group. That is, the capabilities * are shared between those modems defined by list of modem IDs. + * + * @hide */ public final class PhoneCapability implements Parcelable { // Hardcoded default DSDS capability. diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java index deba5519ce22..0e61efac77ec 100644 --- a/telephony/java/android/telephony/ServiceState.java +++ b/telephony/java/android/telephony/ServiceState.java @@ -397,7 +397,6 @@ public class ServiceState implements Parcelable { * @return newly created ServiceState * @hide */ - @SystemApi @NonNull public static ServiceState newFromBundle(@NonNull Bundle m) { ServiceState ret; @@ -1316,7 +1315,6 @@ public class ServiceState implements Parcelable { * @hide * */ - @SystemApi public void fillInNotifierBundle(@NonNull Bundle m) { m.putParcelable(EXTRA_SERVICE_STATE, this); // serviceState already consists of below entries. diff --git a/telephony/java/android/telephony/SignalStrength.java b/telephony/java/android/telephony/SignalStrength.java index ad58c54054a3..283e666f7ab2 100644 --- a/telephony/java/android/telephony/SignalStrength.java +++ b/telephony/java/android/telephony/SignalStrength.java @@ -18,7 +18,6 @@ package android.telephony; import android.annotation.ElapsedRealtimeLong; import android.annotation.NonNull; -import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; import android.os.Build; import android.os.Bundle; @@ -284,7 +283,6 @@ public class SignalStrength implements Parcelable { * * @hide */ - @SystemApi public SignalStrength(@NonNull SignalStrength s) { copyFrom(s); } diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index e6001cebc6c7..ac11d46c5754 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -1579,7 +1579,6 @@ public class TelephonyManager { * <p class="note">This is a protected intent that can only be sent by the system.</p> * @hide */ - @SystemApi @SuppressLint("ActionValue") public static final String ACTION_CARRIER_SIGNAL_REDIRECTED = "com.android.internal.telephony.CARRIER_SIGNAL_REDIRECTED"; @@ -1597,7 +1596,6 @@ public class TelephonyManager { * <p class="note">This is a protected intent that can only be sent by the system. </p> * @hide */ - @SystemApi @SuppressLint("ActionValue") public static final String ACTION_CARRIER_SIGNAL_REQUEST_NETWORK_FAILED = "com.android.internal.telephony.CARRIER_SIGNAL_REQUEST_NETWORK_FAILED"; @@ -1620,7 +1618,6 @@ public class TelephonyManager { * <p class="note">This is a protected intent that can only be sent by the system. </p> * @hide */ - @SystemApi @SuppressLint("ActionValue") public static final String ACTION_CARRIER_SIGNAL_PCO_VALUE = "com.android.internal.telephony.CARRIER_SIGNAL_PCO_VALUE"; @@ -1638,7 +1635,6 @@ public class TelephonyManager { * <p class="note">This is a protected intent that can only be sent by the system. </p> * @hide */ - @SystemApi @SuppressLint("ActionValue") public static final String ACTION_CARRIER_SIGNAL_DEFAULT_NETWORK_AVAILABLE = "com.android.internal.telephony.CARRIER_SIGNAL_DEFAULT_NETWORK_AVAILABLE"; @@ -1653,7 +1649,6 @@ public class TelephonyManager { * <p class="note">This is a protected intent that can only be sent by the system.</p> * @hide */ - @SystemApi @SuppressLint("ActionValue") public static final String ACTION_CARRIER_SIGNAL_RESET = "com.android.internal.telephony.CARRIER_SIGNAL_RESET"; @@ -1663,7 +1658,6 @@ public class TelephonyManager { * An string extra of redirected url upon {@link #ACTION_CARRIER_SIGNAL_REDIRECTED}. * @hide */ - @SystemApi @SuppressLint("ActionValue") public static final String EXTRA_REDIRECTION_URL = "redirectionUrl"; @@ -1672,7 +1666,6 @@ public class TelephonyManager { * Check {@link DataFailCause} for all possible values. * @hide */ - @SystemApi @SuppressLint("ActionValue") public static final String EXTRA_ERROR_CODE = "errorCode"; @@ -1686,7 +1679,6 @@ public class TelephonyManager { * * @hide */ - @SystemApi @Deprecated @SuppressLint("ActionValue") public static final String EXTRA_APN_TYPE = "apnType"; @@ -1699,7 +1691,6 @@ public class TelephonyManager { * Check {@link ApnSetting} TYPE_* for its values. * @hide */ - @SystemApi @SuppressLint("ActionValue") public static final String EXTRA_APN_TYPE_INT = "apnTypeInt"; @@ -1711,7 +1702,6 @@ public class TelephonyManager { * * @hide */ - @SystemApi @Deprecated @SuppressLint("ActionValue") public static final String EXTRA_APN_PROTOCOL = "apnProto"; @@ -1722,7 +1712,6 @@ public class TelephonyManager { * Check {@link ApnSetting} PROTOCOL_* for its values. * @hide */ - @SystemApi @SuppressLint("ActionValue") public static final String EXTRA_APN_PROTOCOL_INT = "apnProtoInt"; @@ -1731,7 +1720,6 @@ public class TelephonyManager { * {@link #ACTION_CARRIER_SIGNAL_PCO_VALUE} broadcasts. * @hide */ - @SystemApi @SuppressLint("ActionValue") public static final String EXTRA_PCO_ID = "pcoId"; @@ -1740,7 +1728,6 @@ public class TelephonyManager { * {@link #ACTION_CARRIER_SIGNAL_PCO_VALUE} broadcasts. * @hide */ - @SystemApi @SuppressLint("ActionValue") public static final String EXTRA_PCO_VALUE = "pcoValue"; @@ -1749,7 +1736,6 @@ public class TelephonyManager { * {@link #ACTION_CARRIER_SIGNAL_DEFAULT_NETWORK_AVAILABLE} broadcasts. * @hide */ - @SystemApi @SuppressLint("ActionValue") public static final String EXTRA_DEFAULT_NETWORK_AVAILABLE = "defaultNetworkAvailable"; @@ -2900,6 +2886,8 @@ public class TelephonyManager { /** * Return a collection of all network types * @return network types + * + * @hide */ public static @NonNull @NetworkType int[] getAllNetworkTypes() { return NETWORK_TYPES; @@ -8076,7 +8064,6 @@ public class TelephonyManager { * * @hide */ - @SystemApi @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isInEmergencySmsMode() { try { |