diff --git a/Android.bp b/Android.bp index effd7ce2a63a6..77cc072b95965 100644 --- a/Android.bp +++ b/Android.bp @@ -224,7 +224,6 @@ java_library { "android.hardware.radio.messaging-V2-java", "android.hardware.radio.modem-V2-java", "android.hardware.radio.network-V2-java", - "android.hardware.radio.satellite-V1-java", "android.hardware.radio.sim-V2-java", "android.hardware.radio.voice-V2-java", "android.hardware.thermal-V1.0-java-constants", diff --git a/core/api/test-current.txt b/core/api/test-current.txt index c17bbae6f4597..5b8c0859306e2 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -2977,7 +2977,6 @@ package android.telephony { field public static final int HAL_SERVICE_MESSAGING = 2; // 0x2 field public static final int HAL_SERVICE_MODEM = 3; // 0x3 field public static final int HAL_SERVICE_NETWORK = 4; // 0x4 - field public static final int HAL_SERVICE_SATELLITE = 8; // 0x8 field public static final int HAL_SERVICE_SIM = 5; // 0x5 field public static final int HAL_SERVICE_VOICE = 6; // 0x6 field public static final android.util.Pair HAL_VERSION_UNKNOWN; diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 66711df4db048..39d7cc141837e 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -15132,14 +15132,6 @@ public class TelephonyManager { @TestApi public static final int HAL_SERVICE_IMS = 7; - /** - * HAL service type that supports the HAL APIs implementation of IRadioSatellite - * {@link RadioSatelliteProxy} - * @hide - */ - @TestApi - public static final int HAL_SERVICE_SATELLITE = 8; - /** @hide */ @Retention(RetentionPolicy.SOURCE) @IntDef(prefix = {"HAL_SERVICE_"}, @@ -15152,7 +15144,6 @@ public class TelephonyManager { HAL_SERVICE_SIM, HAL_SERVICE_VOICE, HAL_SERVICE_IMS, - HAL_SERVICE_SATELLITE }) public @interface HalService {} diff --git a/telephony/java/com/android/internal/telephony/RILConstants.java b/telephony/java/com/android/internal/telephony/RILConstants.java index 45daab31ba5b4..8ed60c1b8b3fb 100644 --- a/telephony/java/com/android/internal/telephony/RILConstants.java +++ b/telephony/java/com/android/internal/telephony/RILConstants.java @@ -571,22 +571,6 @@ public interface RILConstants { int RIL_REQUEST_UPDATE_IMS_CALL_STATUS = 240; int RIL_REQUEST_SET_N1_MODE_ENABLED = 241; int RIL_REQUEST_IS_N1_MODE_ENABLED = 242; - int RIL_REQUEST_SET_LOCATION_PRIVACY_SETTING = 243; - int RIL_REQUEST_GET_LOCATION_PRIVACY_SETTING = 244; - int RIL_REQUEST_GET_SATELLITE_CAPABILITIES = 245; - int RIL_REQUEST_SET_SATELLITE_POWER = 246; - int RIL_REQUEST_GET_SATELLITE_POWER = 247; - int RIL_REQUEST_PROVISION_SATELLITE_SERVICE = 248; - int RIL_REQUEST_ADD_ALLOWED_SATELLITE_CONTACTS = 249; - int RIL_REQUEST_REMOVE_ALLOWED_SATELLITE_CONTACTS = 250; - int RIL_REQUEST_SEND_SATELLITE_MESSAGES = 251; - int RIL_REQUEST_GET_PENDING_SATELLITE_MESSAGES = 252; - int RIL_REQUEST_GET_SATELLITE_MODE = 253; - int RIL_REQUEST_SET_SATELLITE_INDICATION_FILTER = 254; - int RIL_REQUEST_START_SENDING_SATELLITE_POINTING_INFO = 255; - int RIL_REQUEST_STOP_SENDING_SATELLITE_POINTING_INFO = 256; - int RIL_REQUEST_GET_MAX_CHARACTERS_PER_SATELLITE_TEXT_MESSAGE = 257; - int RIL_REQUEST_GET_TIME_FOR_NEXT_SATELLITE_VISIBILITY = 258; /* Responses begin */ int RIL_RESPONSE_ACKNOWLEDGEMENT = 800; @@ -648,13 +632,6 @@ public interface RILConstants { int RIL_UNSOL_RESPONSE_SIM_PHONEBOOK_CHANGED = 1053; int RIL_UNSOL_RESPONSE_SIM_PHONEBOOK_RECORDS_RECEIVED = 1054; int RIL_UNSOL_SLICING_CONFIG_CHANGED = 1055; - int RIL_UNSOL_PENDING_SATELLITE_MESSAGE_COUNT = 1056; - int RIL_UNSOL_NEW_SATELLITE_MESSAGES = 1057; - int RIL_UNSOL_SATELLITE_MESSAGES_TRANSFER_COMPLETE = 1058; - int RIL_UNSOL_SATELLITE_POINTING_INFO_CHANGED = 1059; - int RIL_UNSOL_SATELLITE_MODE_CHANGED = 1060; - int RIL_UNSOL_SATELLITE_RADIO_TECHNOLOGY_CHANGED = 1061; - int RIL_UNSOL_SATELLITE_PROVISION_STATE_CHANGED = 1062; /* The following unsols are not defined in RIL.h */ int RIL_UNSOL_HAL_NON_RIL_BASE = 1100;