Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e85b8c3 authored by Thomas Nguyen's avatar Thomas Nguyen
Browse files

DO NOT MERGE Revert "Add SatelliteProxy" 

Revert submission 20583557-Satellite APIs

Reason for revert: We need to revert these changes for U

Reverted changes: /q/submissionid:20583557-Satellite+APIs

Bug: 271297374
Test: Call and SMS/MMS with live network.
atest TelephonyManagerTestOnMockModem
atest VtsHalRadioTargetTest
atest com.android.cellbroadcastreceiver.compliancetests.CellBroadcastConfigTest
atest android.telephony.cts.TelephonyManagerTest
atest android.telephony.cts.SatelliteManagerTest

Change-Id: I586a1f6a01468cb80a9547ebb4559591c97ae335
parent b61bb2ef

Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ java_library { 
        "android.hardware.radio.modem-V2-java",

        "android.hardware.radio.network-V2-java",

        "android.hardware.radio.sim-V2-java",

        "android.hardware.radio.satellite-V1-java",

        "android.hardware.radio.voice-V2-java",

        "voip-common",

        "ims-common",

src/java/com/android/internal/telephony/CommandException.java

+0 −33
Original line number Diff line number Diff line
@@ -131,17 +131,6 @@ public class CommandException extends RuntimeException { 
        BLOCKED_DUE_TO_CALL,

        RF_HARDWARE_ISSUE,

        NO_RF_CALIBRATION_INFO,

        ENCODING_NOT_SUPPORTED,

        FEATURE_NOT_SUPPORTED,

        INVALID_CONTACT,

        MODEM_INCOMPATIBLE,

        NETWORK_TIMEOUT,

        NO_SATELLITE_SIGNAL,

        NOT_SUFFICIENT_ACCOUNT_BALANCE,

        RADIO_TECHNOLOGY_NOT_SUPPORTED,

        SUBSCRIBER_NOT_AUTHORIZED,

        SWITCHED_FROM_SATELLITE_TO_TERRESTRIAL,

        UNIDENTIFIED_SUBSCRIBER

    }



    @UnsupportedAppUsage
@@ -352,28 +341,6 @@ public class CommandException extends RuntimeException { 
                return new CommandException(Error.RF_HARDWARE_ISSUE);

            case RILConstants.NO_RF_CALIBRATION_INFO:

                return new CommandException(Error.NO_RF_CALIBRATION_INFO);

            case RILConstants.ENCODING_NOT_SUPPORTED:

                return new CommandException(Error.ENCODING_NOT_SUPPORTED);

            case RILConstants.FEATURE_NOT_SUPPORTED:

                return new CommandException(Error.FEATURE_NOT_SUPPORTED);

            case RILConstants.INVALID_CONTACT:

                return new CommandException(Error.INVALID_CONTACT);

            case RILConstants.MODEM_INCOMPATIBLE:

                return new CommandException(Error.MODEM_INCOMPATIBLE);

            case RILConstants.NETWORK_TIMEOUT:

                return new CommandException(Error.NETWORK_TIMEOUT);

            case RILConstants.NO_SATELLITE_SIGNAL:

                return new CommandException(Error.NO_SATELLITE_SIGNAL);

            case RILConstants.NOT_SUFFICIENT_ACCOUNT_BALANCE:

                return new CommandException(Error.NOT_SUFFICIENT_ACCOUNT_BALANCE);

            case RILConstants.RADIO_TECHNOLOGY_NOT_SUPPORTED:

                return new CommandException(Error.RADIO_TECHNOLOGY_NOT_SUPPORTED);

            case RILConstants.SUBSCRIBER_NOT_AUTHORIZED:

                return new CommandException(Error.SUBSCRIBER_NOT_AUTHORIZED);

            case RILConstants.SWITCHED_FROM_SATELLITE_TO_TERRESTRIAL:

                return new CommandException(Error.SWITCHED_FROM_SATELLITE_TO_TERRESTRIAL);

            case RILConstants.UNIDENTIFIED_SUBSCRIBER:

                return new CommandException(Error.UNIDENTIFIED_SUBSCRIBER);

            default:

                Rlog.e("GSM", "Unrecognized RIL errno " + ril_errno);

                return new CommandException(Error.INVALID_RESPONSE);

src/java/com/android/internal/telephony/MockModem.java

+0 −34
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import static android.telephony.TelephonyManager.HAL_SERVICE_IMS; 
import static android.telephony.TelephonyManager.HAL_SERVICE_MESSAGING;

import static android.telephony.TelephonyManager.HAL_SERVICE_MODEM;

import static android.telephony.TelephonyManager.HAL_SERVICE_NETWORK;

import static android.telephony.TelephonyManager.HAL_SERVICE_SATELLITE;

import static android.telephony.TelephonyManager.HAL_SERVICE_SIM;

import static android.telephony.TelephonyManager.HAL_SERVICE_VOICE;
@@ -45,8 +44,6 @@ public class MockModem { 
    private static final String BIND_IRADIOVOICE = "android.telephony.mockmodem.iradiovoice";

    private static final String BIND_IRADIOIMS = "android.telephony.mockmodem.iradioims";

    private static final String BIND_IRADIOCONFIG = "android.telephony.mockmodem.iradioconfig";

    private static final String BIND_IRADIOSATELLITE =

            "android.telephony.mockmodem.iradiosatellite";

    private static final String PHONE_ID = "phone_id";



    private static final byte DEFAULT_PHONE_ID = 0x00;
@@ -68,7 +65,6 @@ public class MockModem { 
    private IBinder mVoiceBinder;

    private IBinder mImsBinder;

    private IBinder mConfigBinder;

    private IBinder mSatelliteBinder;

    private ServiceConnection mModemServiceConnection;

    private ServiceConnection mSimServiceConnection;

    private ServiceConnection mMessagingServiceConnection;
@@ -77,7 +73,6 @@ public class MockModem { 
    private ServiceConnection mVoiceServiceConnection;

    private ServiceConnection mImsServiceConnection;

    private ServiceConnection mConfigServiceConnection;

    private ServiceConnection mSatelliteServiceConnection;



    private byte mPhoneId;

    private String mTag;
@@ -120,8 +115,6 @@ public class MockModem { 
                mVoiceBinder = binder;

            } else if (mService == HAL_SERVICE_IMS) {

                mImsBinder = binder;

            } else if (mService == HAL_SERVICE_SATELLITE) {

                mSatelliteBinder = binder;

            } else if (mService == RADIOCONFIG_SERVICE) {

                mConfigBinder = binder;

            }
@@ -145,8 +138,6 @@ public class MockModem { 
                mVoiceBinder = null;

            } else if (mService == HAL_SERVICE_IMS) {

                mImsBinder = null;

            } else if (mService == HAL_SERVICE_SATELLITE) {

                mSatelliteBinder = null;

            } else if (mService == RADIOCONFIG_SERVICE) {

                mConfigBinder = null;

            }
@@ -188,8 +179,6 @@ public class MockModem { 
                return mVoiceBinder;

            case HAL_SERVICE_IMS:

                return mImsBinder;

            case HAL_SERVICE_SATELLITE:

                return mSatelliteBinder;

            case RADIOCONFIG_SERVICE:

                return mConfigBinder;

            default:
@@ -317,20 +306,6 @@ public class MockModem { 
            } else {

                Rlog.d(TAG, "IRadio Ims is bound");

            }

        } else if (service == HAL_SERVICE_SATELLITE) {

            if (mSatelliteBinder == null) {

                mSatelliteServiceConnection = new MockModemConnection(HAL_SERVICE_SATELLITE);



                boolean status =

                        bindModuleToMockModemService(

                                mPhoneId, BIND_IRADIOSATELLITE, mSatelliteServiceConnection);

                if (!status) {

                    Rlog.d(TAG, "IRadio Satellite bind fail");

                    mSatelliteServiceConnection = null;

                }

            } else {

                Rlog.d(TAG, "IRadio Satellite is bound");

            }

        }

    }
@@ -393,13 +368,6 @@ public class MockModem { 
                mImsBinder = null;

                Rlog.d(TAG, "unbind IRadio Ims");

            }

        } else if (service == HAL_SERVICE_SATELLITE) {

            if (mSatelliteServiceConnection != null) {

                mContext.unbindService(mSatelliteServiceConnection);

                mSatelliteServiceConnection = null;

                mSatelliteBinder = null;

                Rlog.d(TAG, "unbind IRadio Satellite");

            }

        }

    }
@@ -423,8 +391,6 @@ public class MockModem { 
                return "voice";

            case HAL_SERVICE_IMS:

                return "ims";

            case HAL_SERVICE_SATELLITE:

                return "satellite";

            case RADIOCONFIG_SERVICE:

                return "config";

            default:

src/java/com/android/internal/telephony/RIL.java

+74 −447

File changed.

Preview size limit exceeded, changes collapsed.

src/java/com/android/internal/telephony/RILUtils.java

+0 −115
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import static android.telephony.TelephonyManager.CAPABILITY_THERMAL_MITIGATION_D 
import static android.telephony.TelephonyManager.CAPABILITY_USES_ALLOWED_NETWORK_TYPES_BITMASK;



import static com.android.internal.telephony.RILConstants.RIL_REQUEST_ACKNOWLEDGE_INCOMING_GSM_SMS_WITH_PDU;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_ADD_ALLOWED_SATELLITE_CONTACTS;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_ALLOCATE_PDU_SESSION_ID;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_ALLOW_DATA;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_ANSWER;
@@ -91,17 +90,12 @@ import static com.android.internal.telephony.RILConstants.RIL_REQUEST_GET_HARDWA 
import static com.android.internal.telephony.RILConstants.RIL_REQUEST_GET_IMEI;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_GET_IMEISV;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_GET_IMSI;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_GET_MAX_CHARACTERS_PER_SATELLITE_TEXT_MESSAGE;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_GET_MODEM_STATUS;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_GET_MUTE;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_GET_NEIGHBORING_CELL_IDS;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_GET_PENDING_SATELLITE_MESSAGES;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_GET_PHONE_CAPABILITY;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_GET_PREFERRED_NETWORK_TYPE;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_GET_RADIO_CAPABILITY;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_GET_SATELLITE_CAPABILITIES;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_GET_SATELLITE_MODE;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_GET_SATELLITE_POWER;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_GET_SIM_PHONEBOOK_CAPACITY;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_GET_SIM_PHONEBOOK_RECORDS;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_GET_SIM_STATUS;
@@ -109,7 +103,6 @@ import static com.android.internal.telephony.RILConstants.RIL_REQUEST_GET_SLICIN 
import static com.android.internal.telephony.RILConstants.RIL_REQUEST_GET_SLOT_STATUS;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_GET_SMSC_ADDRESS;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_GET_SYSTEM_SELECTION_CHANNELS;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_GET_TIME_FOR_NEXT_SATELLITE_VISIBILITY;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_GET_UICC_APPLICATIONS_ENABLEMENT;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_GET_USAGE_SETTING;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_GSM_BROADCAST_ACTIVATION;
@@ -133,7 +126,6 @@ import static com.android.internal.telephony.RILConstants.RIL_REQUEST_NV_WRITE_I 
import static com.android.internal.telephony.RILConstants.RIL_REQUEST_OEM_HOOK_RAW;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_OEM_HOOK_STRINGS;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_OPERATOR;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_PROVISION_SATELLITE_SERVICE;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_PULL_LCEDATA;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_QUERY_AVAILABLE_BAND_MODE;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_QUERY_AVAILABLE_NETWORKS;
@@ -145,14 +137,12 @@ import static com.android.internal.telephony.RILConstants.RIL_REQUEST_QUERY_NETW 
import static com.android.internal.telephony.RILConstants.RIL_REQUEST_QUERY_TTY_MODE;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_RADIO_POWER;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_RELEASE_PDU_SESSION_ID;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_REMOVE_ALLOWED_SATELLITE_CONTACTS;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_REPORT_SMS_MEMORY_STATUS;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_REPORT_STK_SERVICE_IS_RUNNING;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_RESET_RADIO;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_SCREEN_STATE;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_SEND_ANBR_QUERY;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_SEND_DEVICE_STATE;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_SEND_SATELLITE_MESSAGES;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_SEND_SMS;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_SEND_SMS_EXPECT_MORE;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_SEND_USSD;
@@ -182,8 +172,6 @@ import static com.android.internal.telephony.RILConstants.RIL_REQUEST_SET_NULL_C 
import static com.android.internal.telephony.RILConstants.RIL_REQUEST_SET_PREFERRED_DATA_MODEM;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_SET_PREFERRED_NETWORK_TYPE;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_SET_RADIO_CAPABILITY;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_SET_SATELLITE_INDICATION_FILTER;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_SET_SATELLITE_POWER;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_SET_SIGNAL_STRENGTH_REPORTING_CRITERIA;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_SET_SIM_CARD_POWER;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_SET_SMSC_ADDRESS;
@@ -209,7 +197,6 @@ import static com.android.internal.telephony.RILConstants.RIL_REQUEST_START_IMS_ 
import static com.android.internal.telephony.RILConstants.RIL_REQUEST_START_KEEPALIVE;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_START_LCE;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_START_NETWORK_SCAN;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_START_SENDING_SATELLITE_POINTING_INFO;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_STK_GET_PROFILE;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_STK_HANDLE_CALL_SETUP_REQUESTED_FROM_SIM;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_STK_SEND_ENVELOPE_COMMAND;
@@ -220,7 +207,6 @@ import static com.android.internal.telephony.RILConstants.RIL_REQUEST_STOP_IMS_T 
import static com.android.internal.telephony.RILConstants.RIL_REQUEST_STOP_KEEPALIVE;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_STOP_LCE;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_STOP_NETWORK_SCAN;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_STOP_SENDING_SATELLITE_POINTING_INFO;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_SWITCH_DUAL_SIM_CONFIG;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_SWITCH_WAITING_OR_HOLDING_AND_ACTIVE;

import static com.android.internal.telephony.RILConstants.RIL_REQUEST_TRIGGER_EMERGENCY_NETWORK_SCAN;
@@ -255,7 +241,6 @@ import static com.android.internal.telephony.RILConstants.RIL_UNSOL_KEEPALIVE_ST 
import static com.android.internal.telephony.RILConstants.RIL_UNSOL_LCEDATA_RECV;

import static com.android.internal.telephony.RILConstants.RIL_UNSOL_MODEM_RESTART;

import static com.android.internal.telephony.RILConstants.RIL_UNSOL_NETWORK_SCAN_RESULT;

import static com.android.internal.telephony.RILConstants.RIL_UNSOL_NEW_SATELLITE_MESSAGES;

import static com.android.internal.telephony.RILConstants.RIL_UNSOL_NITZ_TIME_RECEIVED;

import static com.android.internal.telephony.RILConstants.RIL_UNSOL_NOTIFY_ANBR;

import static com.android.internal.telephony.RILConstants.RIL_UNSOL_OEM_HOOK_RAW;
@@ -263,7 +248,6 @@ import static com.android.internal.telephony.RILConstants.RIL_UNSOL_ON_SS; 
import static com.android.internal.telephony.RILConstants.RIL_UNSOL_ON_USSD;

import static com.android.internal.telephony.RILConstants.RIL_UNSOL_ON_USSD_REQUEST;

import static com.android.internal.telephony.RILConstants.RIL_UNSOL_PCO_DATA;

import static com.android.internal.telephony.RILConstants.RIL_UNSOL_PENDING_SATELLITE_MESSAGE_COUNT;

import static com.android.internal.telephony.RILConstants.RIL_UNSOL_PHYSICAL_CHANNEL_CONFIG;

import static com.android.internal.telephony.RILConstants.RIL_UNSOL_RADIO_CAPABILITY;

import static com.android.internal.telephony.RILConstants.RIL_UNSOL_REGISTRATION_FAILED;
@@ -283,11 +267,6 @@ import static com.android.internal.telephony.RILConstants.RIL_UNSOL_RESPONSE_SIM 
import static com.android.internal.telephony.RILConstants.RIL_UNSOL_RESTRICTED_STATE_CHANGED;

import static com.android.internal.telephony.RILConstants.RIL_UNSOL_RIL_CONNECTED;

import static com.android.internal.telephony.RILConstants.RIL_UNSOL_RINGBACK_TONE;

import static com.android.internal.telephony.RILConstants.RIL_UNSOL_SATELLITE_MESSAGES_TRANSFER_COMPLETE;

import static com.android.internal.telephony.RILConstants.RIL_UNSOL_SATELLITE_MODE_CHANGED;

import static com.android.internal.telephony.RILConstants.RIL_UNSOL_SATELLITE_POINTING_INFO_CHANGED;

import static com.android.internal.telephony.RILConstants.RIL_UNSOL_SATELLITE_PROVISION_STATE_CHANGED;

import static com.android.internal.telephony.RILConstants.RIL_UNSOL_SATELLITE_RADIO_TECHNOLOGY_CHANGED;

import static com.android.internal.telephony.RILConstants.RIL_UNSOL_SIGNAL_STRENGTH;

import static com.android.internal.telephony.RILConstants.RIL_UNSOL_SIM_REFRESH;

import static com.android.internal.telephony.RILConstants.RIL_UNSOL_SIM_SMS_STORAGE_FULL;
@@ -374,8 +353,6 @@ import android.telephony.ims.feature.ConnectionFailureInfo; 
import android.telephony.ims.feature.MmTelFeature;

import android.telephony.ims.stub.ImsRegistrationImplBase;

import android.telephony.ims.stub.ImsRegistrationImplBase.ImsDeregistrationReason;

import android.telephony.satellite.PointingInfo;

import android.telephony.satellite.SatelliteCapabilities;

import android.telephony.satellite.SatelliteManager;

import android.text.TextUtils;

import android.util.ArraySet;
@@ -5366,34 +5343,6 @@ public class RILUtils { 
                return "SET_N1_MODE_ENABLED";

            case RIL_REQUEST_IS_N1_MODE_ENABLED:

                return "IS_N1_MODE_ENABLED";

            case RIL_REQUEST_GET_SATELLITE_CAPABILITIES:

                return "GET_SATELLITE_CAPABILITIES";

            case RIL_REQUEST_SET_SATELLITE_POWER:

                return "SET_SATELLITE_POWER";

            case RIL_REQUEST_GET_SATELLITE_POWER:

                return "GET_SATELLITE_POWER";

            case RIL_REQUEST_PROVISION_SATELLITE_SERVICE:

                return "PROVISION_SATELLITE_SERVICE";

            case RIL_REQUEST_ADD_ALLOWED_SATELLITE_CONTACTS:

                return "ADD_ALLOWED_SATELLITE_CONTACTS";

            case RIL_REQUEST_REMOVE_ALLOWED_SATELLITE_CONTACTS:

                return "REMOVE_ALLOWED_SATELLITE_CONTACTS";

            case RIL_REQUEST_SEND_SATELLITE_MESSAGES:

                return "SEND_SATELLITE_MESSAGES";

            case RIL_REQUEST_GET_PENDING_SATELLITE_MESSAGES:

                return "GET_PENDING_SATELLITE_MESSAGES";

            case RIL_REQUEST_GET_SATELLITE_MODE:

                return "GET_SATELLITE_MODE";

            case RIL_REQUEST_SET_SATELLITE_INDICATION_FILTER:

                return "SET_SATELLITE_INDICATION_FILTER";

            case RIL_REQUEST_START_SENDING_SATELLITE_POINTING_INFO:

                return "START_SENDING_SATELLITE_POINTING_INFO";

            case RIL_REQUEST_STOP_SENDING_SATELLITE_POINTING_INFO:

                return "STOP_SENDING_SATELLITE_POINTING_INFO";

            case RIL_REQUEST_GET_MAX_CHARACTERS_PER_SATELLITE_TEXT_MESSAGE:

                return "GET_MAX_CHARACTERS_PER_SATELLITE_TEXT_MESSAGE";

            case RIL_REQUEST_GET_TIME_FOR_NEXT_SATELLITE_VISIBILITY:

                return "GET_TIME_FOR_NEXT_SATELLITE_VISIBILITY";

            default:

                return "<unknown request " + request + ">";

        }
@@ -5534,20 +5483,6 @@ public class RILUtils { 
                return "UNSOL_NOTIFY_ANBR";

            case RIL_UNSOL_TRIGGER_IMS_DEREGISTRATION:

                return "UNSOL_TRIGGER_IMS_DEREGISTRATION";

            case RIL_UNSOL_PENDING_SATELLITE_MESSAGE_COUNT:

                return "UNSOL_PENDING_SATELLITE_MESSAGE_COUNT";

            case RIL_UNSOL_NEW_SATELLITE_MESSAGES:

                return "UNSOL_NEW_SATELLITE_MESSAGES";

            case RIL_UNSOL_SATELLITE_MESSAGES_TRANSFER_COMPLETE:

                return "UNSOL_SATELLITE_MESSAGES_TRANSFER_COMPLETE";

            case RIL_UNSOL_SATELLITE_POINTING_INFO_CHANGED:

                return "UNSOL_SATELLITE_POINTING_INFO_CHANGED";

            case RIL_UNSOL_SATELLITE_MODE_CHANGED:

                return "UNSOL_SATELLITE_MODE_CHANGED";

            case RIL_UNSOL_SATELLITE_RADIO_TECHNOLOGY_CHANGED:

                return "UNSOL_SATELLITE_RADIO_TECHNOLOGY_CHANGED";

            case RIL_UNSOL_SATELLITE_PROVISION_STATE_CHANGED:

                return "UNSOL_SATELLITE_PROVISION_STATE_CHANGED";

            default:

                return "<unknown response>";

        }
@@ -5932,50 +5867,6 @@ public class RILUtils { 
        return halInfos;

    }



    /**

     * Convert android.hardware.radio.satellite.SatelliteCapabilities to

     * android.telephony.satellite.SatelliteCapabilities

     */

    public static SatelliteCapabilities convertHalSatelliteCapabilities(

            android.hardware.radio.satellite.SatelliteCapabilities capabilities) {

        Set<Integer> supportedRadioTechnologies = new HashSet<>();

        if (capabilities.supportedRadioTechnologies != null

                && capabilities.supportedRadioTechnologies.length > 0) {

            for (int technology : capabilities.supportedRadioTechnologies) {

                supportedRadioTechnologies.add(technology);

            }

        }

        return new SatelliteCapabilities(supportedRadioTechnologies, capabilities.isAlwaysOn,

                capabilities.needsPointingToSatellite, capabilities.needsSeparateSimProfile);

    }



    /**

     * Convert from android.hardware.radio.satellite.PointingInfo to

     * android.telephony.satellite.stub.PointingInfo

     */

    public static PointingInfo convertHalSatellitePointingInfo(

            android.hardware.radio.satellite.PointingInfo pointingInfo) {

        return new PointingInfo(pointingInfo.satelliteAzimuthDegrees,

                pointingInfo.satelliteElevationDegrees, pointingInfo.antennaAzimuthDegrees,

                pointingInfo.antennaPitchDegrees, pointingInfo.antennaRollDegrees);

    }



    /**

     * Convert from android.telephony.satellite.stub.PointingInfo to

     * android.hardware.radio.satellite.PointingInfo

     */

    public static android.hardware.radio.satellite.PointingInfo convertToHalSatellitePointingInfo(

            PointingInfo pointingInfo) {

        android.hardware.radio.satellite.PointingInfo halPointingInfo =

                new android.hardware.radio.satellite.PointingInfo();

        halPointingInfo.satelliteAzimuthDegrees = pointingInfo.getSatelliteAzimuthDegrees();

        halPointingInfo.satelliteElevationDegrees = pointingInfo.getSatelliteElevationDegrees();

        halPointingInfo.antennaAzimuthDegrees = pointingInfo.getAntennaAzimuthDegrees();

        halPointingInfo.antennaPitchDegrees = pointingInfo.getAntennaPitchDegrees();

        halPointingInfo.antennaRollDegrees = pointingInfo.getAntennaRollDegrees();

        return halPointingInfo;

    }



    /**

     * Convert satellite-related errors from CommandException.Error to

     * SatelliteManager.SatelliteServiceResult.
@@ -6006,18 +5897,12 @@ public class RILUtils { 
                return SatelliteManager.SATELLITE_NO_RESOURCES;

            case NETWORK_ERR:

                return SatelliteManager.SATELLITE_NETWORK_ERROR;

            case NETWORK_TIMEOUT:

                return SatelliteManager.SATELLITE_NETWORK_TIMEOUT;

            case NO_NETWORK_FOUND:

                //fallthrough to NO_SATELLITE_SIGNAL

            case NO_SATELLITE_SIGNAL:

                return SatelliteManager.SATELLITE_NOT_REACHABLE;

            case ABORTED:

                return SatelliteManager.SATELLITE_REQUEST_ABORTED;

            case ACCESS_BARRED:

                return SatelliteManager.SATELLITE_ACCESS_BARRED;

            case SUBSCRIBER_NOT_AUTHORIZED:

                return SatelliteManager.SATELLITE_NOT_AUTHORIZED;

            default:

                return SatelliteManager.SATELLITE_ERROR;

        }