Merge "Revert "Add RIL requests and unsol for Satellite HAL"" into main (832207ab) · Commits · e / os / android_frameworks_base

Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -227,7 +227,6 @@ java_library {
		"android.hardware.radio.messaging-V3-java",
		"android.hardware.radio.modem-V3-java",
		"android.hardware.radio.network-V3-java",
		"android.hardware.radio.satellite-V1-java",
		"android.hardware.radio.sim-V3-java",
		"android.hardware.radio.voice-V3-java",
		"android.hardware.thermal-V1.0-java-constants",

core/api/test-current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -3185,7 +3185,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 @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") 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;

telephony/java/android/telephony/TelephonyManager.java

+0 −10

Original line number	Diff line number	Diff line
		@@ -15033,15 +15033,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
		@FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG)
		public static final int HAL_SERVICE_SATELLITE = 8;

		/** @hide */
		@Retention(RetentionPolicy.SOURCE)
		@IntDef(prefix = {"HAL_SERVICE_"},
		@@ -15054,7 +15045,6 @@ public class TelephonyManager {
		HAL_SERVICE_SIM,
		HAL_SERVICE_VOICE,
		HAL_SERVICE_IMS,
		HAL_SERVICE_SATELLITE
		})
		public @interface HalService {}

telephony/java/com/android/internal/telephony/RILConstants.java

+1 −48

Original line number	Diff line number	Diff line
		@@ -120,31 +120,6 @@ public interface RILConstants {
		int BLOCKED_DUE_TO_CALL = 69; /* SMS is blocked due to call control */
		int RF_HARDWARE_ISSUE = 70; /* RF HW issue is detected */
		int NO_RF_CALIBRATION_INFO = 71; /* No RF calibration in device */
		int ENCODING_NOT_SUPPORTED = 72; /* The encoding scheme is not supported by
		either the network or the MS. */
		int FEATURE_NOT_SUPPORTED = 73; /* The requesting feature is not supported by
		the service provider. */
		int INVALID_CONTACT = 74; /* The contact to be added is either not
		existing or not valid. */
		int MODEM_INCOMPATIBLE = 75; /* The modem of the MS is not compatible with
		the service provider. */
		int NETWORK_TIMEOUT = 76; /* Modem timeout to receive ACK or response from
		network after sending a request to it. */
		int NO_SATELLITE_SIGNAL = 77; /* Modem fails to communicate with the satellite
		network since there is no satellite signal.*/
		int NOT_SUFFICIENT_ACCOUNT_BALANCE = 78; /* The request cannot be performed since the
		subscriber's account balance is not
		sufficient. */
		int RADIO_TECHNOLOGY_NOT_SUPPORTED = 79; /* The radio technology is not supported by the
		service provider. */
		int SUBSCRIBER_NOT_AUTHORIZED = 80; /* The subscription is not authorized to
		register with the service provider. */
		int SWITCHED_FROM_SATELLITE_TO_TERRESTRIAL = 81; /* While processing a request from the
		Framework the satellite modem detects
		terrestrial signal, aborts the request, and
		switches to the terrestrial network. */
		int UNIDENTIFIED_SUBSCRIBER = 82; /* The subscriber is not registered with the
		service provider */

		// Below is list of OEM specific error codes which can by used by OEMs in case they don't want to
		// reveal particular replacement for Generic failure
		@@ -568,22 +543,7 @@ public interface RILConstants {
		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;
		int RIL_REQUEST_IS_NULL_CIPHER_AND_INTEGRITY_ENABLED = 259;
		int RIL_REQUEST_SET_SATELLITE_PLMN = 260;
		int RIL_REQUEST_IS_NULL_CIPHER_AND_INTEGRITY_ENABLED = 245;

		/* Responses begin */
		int RIL_RESPONSE_ACKNOWLEDGEMENT = 800;
		@@ -645,13 +605,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;