Merge "Remove deprecated IRadio <1.4 APIs and references" (1372a690) · Commits · e / os / android_frameworks_opt_telephony

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

+0 −25

Original line number	Diff line number	Diff line
		@@ -69,8 +69,6 @@ public abstract class BaseCommands implements CommandsInterface {
		protected RegistrantList mVoicePrivacyOnRegistrants = new RegistrantList();
		protected RegistrantList mVoicePrivacyOffRegistrants = new RegistrantList();
		@UnsupportedAppUsage
		protected Registrant mUnsolOemHookRawRegistrant;
		@UnsupportedAppUsage
		protected RegistrantList mOtaProvisionRegistrants = new RegistrantList();
		@UnsupportedAppUsage
		protected RegistrantList mCallWaitingInfoRegistrants = new RegistrantList();
		@@ -681,17 +679,6 @@ public abstract class BaseCommands implements CommandsInterface {
		mSignalInfoRegistrants.addUnique(h, what, obj);
		}

		public void setOnUnsolOemHookRaw(Handler h, int what, Object obj) {
		mUnsolOemHookRawRegistrant = new Registrant (h, what, obj);
		}

		public void unSetOnUnsolOemHookRaw(Handler h) {
		if (mUnsolOemHookRawRegistrant != null && mUnsolOemHookRawRegistrant.getHandler() == h) {
		mUnsolOemHookRawRegistrant.clear();
		mUnsolOemHookRawRegistrant = null;
		}
		}

		@Override
		public void unregisterForSignalInfo(Handler h) {
		mSignalInfoRegistrants.remove(h);
		@@ -1010,18 +997,6 @@ public abstract class BaseCommands implements CommandsInterface {
		mPhoneRadioCapabilityChangedRegistrants.remove(h);
		}

		@Override
		public void startLceService(int reportIntervalMs, boolean pullMode, Message result) {
		}

		@Override
		public void stopLceService(Message result) {
		}

		@Override
		public void pullLceData(Message result) {
		}

		@Override
		public void registerForLceInfo(Handler h, int what, Object obj) {
		synchronized (mStateMonitor) {

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

+8 −133

Original line number	Diff line number	Diff line
		@@ -899,18 +899,6 @@ public interface CommandsInterface {
		*/
		void getCurrentCalls (Message result);

		/**
		* returned message
		* retMsg.obj = AsyncResult ar
		* ar.exception carries exception on failure
		* ar.userObject contains the orignal value of result.obj
		* ar.result contains a List of DataCallResponse
		* @deprecated Do not use.
		*/
		@UnsupportedAppUsage
		@Deprecated
		void getPDPContextList(Message result);

		/**
		* returned message
		* retMsg.obj = AsyncResult ar
		@@ -968,25 +956,6 @@ public interface CommandsInterface {
		*/
		void getIMSIForApp(String aid, Message result);

		/**
		* returned message
		* retMsg.obj = AsyncResult ar
		* ar.exception carries exception on failure
		* ar.userObject contains the orignal value of result.obj
		* ar.result is String containing IMEI on success
		*/
		void getIMEI(Message result);

		/**
		* returned message
		* retMsg.obj = AsyncResult ar
		* ar.exception carries exception on failure
		* ar.userObject contains the orignal value of result.obj
		* ar.result is String containing IMEISV on success
		*/
		@UnsupportedAppUsage
		void getIMEISV(Message result);

		/**
		* Hang up one individual connection.
		* returned message
		@@ -1102,25 +1071,6 @@ public interface CommandsInterface {
		*/
		void getLastCallFailCause (Message result);


		/**
		* Reason for last PDP context deactivate or failure to activate
		* cause code returned as int[0] in Message.obj.response
		* returns an integer cause code defined in TS 24.008
		* section 6.1.3.1.3 or close approximation
		* @deprecated Do not use.
		*/
		@UnsupportedAppUsage
		@Deprecated
		void getLastPdpFailCause (Message result);

		/**
		* The preferred new alternative to getLastPdpFailCause
		* that is also CDMA-compatible.
		*/
		@UnsupportedAppUsage
		void getLastDataCallFailCause (Message result);

		void setMute (boolean enableMute, Message response);

		void getMute (Message response);
		@@ -1549,8 +1499,6 @@ public interface CommandsInterface {
		*/
		void cancelPendingUssd (Message response);

		void resetRadio(Message result);

		/**
		* Assign a specified band for RF configuration.
		*
		@@ -1681,28 +1629,14 @@ public interface CommandsInterface {
		@UnsupportedAppUsage
		void reportStkServiceIsRunning(Message result);

		@UnsupportedAppUsage
		void invokeOemRilRequestRaw(byte[] data, Message response);

		/**
		* Sends carrier specific information to the vendor ril that can be used to
		* encrypt the IMSI and IMPI.
		*
		* @param publicKey the public key of the carrier used to encrypt IMSI/IMPI.
		* @param keyIdentifier the key identifier is optional information that is carrier
		* specific.
		* @param imsiEncryptionInfo the IMSI encryption info
		* @param response callback message
		*/
		void setCarrierInfoForImsiEncryption(ImsiEncryptionInfo imsiEncryptionInfo,
		Message response);

		void invokeOemRilRequestStrings(String[] strings, Message response);

		/**
		* Fires when RIL_UNSOL_OEM_HOOK_RAW is received from the RIL.
		*/
		void setOnUnsolOemHookRaw(Handler h, int what, Object obj);
		void unSetOnUnsolOemHookRaw(Handler h);
		void setCarrierInfoForImsiEncryption(ImsiEncryptionInfo imsiEncryptionInfo, Message response);

		/**
		* Send TERMINAL RESPONSE to the SIM, after processing a proactive command
		@@ -1879,15 +1813,13 @@ public interface CommandsInterface {
		void queryTTYMode(Message response);

		/**
		* Setup a packet data connection On successful completion, the result
		* Setup a packet data connection. On successful completion, the result
		* message will return a SetupDataResult object containing the connection information.
		*
		* @param accessNetworkType
		* Access network to use. Values is one of AccessNetworkConstants.AccessNetworkType.
		* @param dataProfile
		* Data profile for data call setup
		* @param isRoaming
		* Device is roaming or not
		* @param allowRoaming
		* Flag indicating data roaming is enabled or not
		* @param reason
		@@ -1918,9 +1850,9 @@ public interface CommandsInterface {
		* @param result
		* Callback message
		*/
		void setupDataCall(int accessNetworkType, DataProfile dataProfile, boolean isRoaming,
		boolean allowRoaming, int reason, LinkProperties linkProperties, int pduSessionId,
		NetworkSliceInfo sliceInfo, TrafficDescriptor trafficDescriptor,
		void setupDataCall(int accessNetworkType, DataProfile dataProfile, boolean allowRoaming,
		int reason, LinkProperties linkProperties, int pduSessionId, NetworkSliceInfo sliceInfo,
		TrafficDescriptor trafficDescriptor,
		boolean matchAllRuleAllowed, Message result);

		/**
		@@ -1981,22 +1913,6 @@ public interface CommandsInterface {
		@UnsupportedAppUsage
		public void getIccCardStatus(Message result);

		/**
		* Request the status of all the physical UICC slots.
		*
		* @param result Callback message containing a {@link java.util.ArrayList} of
		* {@link com.android.internal.telephony.uicc.IccSlotStatus} instances for all the slots.
		*/
		void getIccSlotsStatus(Message result);

		/**
		* Set the mapping from logical slots to physical slots.
		*
		* @param physicalSlots Mapping from logical slots to physical slots.
		* @param result Callback message is empty on completion.
		*/
		void setLogicalToPhysicalSlotMapping(int[] physicalSlots, Message result);

		/**
		* Request the SIM application on the UICC to perform authentication
		* challenge/response algorithm. The data string and challenge response are
		@@ -2074,24 +1990,20 @@ public interface CommandsInterface {
		*
		* @param dataProfile
		* data profile for initial APN attach
		* @param isRoaming
		* indicating the device is roaming or not
		* @param result
		* callback message contains the information of SUCCESS/FAILURE
		*/
		void setInitialAttachApn(DataProfile dataProfile, boolean isRoaming, Message result);
		void setInitialAttachApn(DataProfile dataProfile, Message result);

		/**
		* Set data profiles in modem
		*
		* @param dps
		* Array of the data profiles set to modem
		* @param isRoaming
		* Indicating if the device is roaming or not
		* @param result
		* callback message contains the information of SUCCESS/FAILURE
		*/
		void setDataProfile(DataProfile[] dps, boolean isRoaming, Message result);
		void setDataProfile(DataProfile[] dps, Message result);

		/**
		* Notifiy that we are testing an emergency call
		@@ -2255,15 +2167,6 @@ public interface CommandsInterface {
		public void setUiccSubscription(int slotId, int appIndex, int subId, int subStatus,
		Message result);

		/**
		* Whether the device modem supports reporting the EID in either the slot or card status or
		* through ATR.
		* @return true if the modem supports EID.
		*/
		default boolean supportsEid() {
		return false;
		}

		/**
		* Tells the modem if data is allowed or not.
		*
		@@ -2317,34 +2220,6 @@ public interface CommandsInterface {
		*/
		public void unregisterForRadioCapabilityChanged(Handler h);

		/**
		* Start LCE (Link Capacity Estimation) service with a desired reporting interval.
		*
		* @param reportIntervalMs
		* LCE info reporting interval (ms).
		*
		* @param result Callback message contains the current LCE status.
		* {byte status, int actualIntervalMs}
		*/
		public void startLceService(int reportIntervalMs, boolean pullMode, Message result);

		/**
		* Stop LCE service.
		*
		* @param result Callback message contains the current LCE status:
		* {byte status, int actualIntervalMs}
		*
		*/
		public void stopLceService(Message result);

		/**
		* Pull LCE service for capacity data.
		*
		* @param result Callback message contains the capacity info:
		* {int capacityKbps, byte confidenceLevel, byte lceSuspendedTemporarily}
		*/
		public void pullLceData(Message result);

		/**
		* Register a LCE info listener.
		*

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -3037,7 +3037,6 @@ public class GsmCdmaPhone extends Phone {
		mCi.areUiccApplicationsEnabled(obtainMessage(EVENT_GET_UICC_APPS_ENABLEMENT_DONE));

		handleNullCipherEnabledChange();
		startLceAfterRadioIsAvailable();
		}

		private void handleRadioOn() {
		@@ -4398,7 +4397,6 @@ public class GsmCdmaPhone extends Phone {
		} else {
		loge("deleteAndCreatePhone: newVoiceRadioTech=" + newVoiceRadioTech +
		" is not CDMA or GSM (error) - aborting!");
		return;
		}
		}

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

+0 −73

Original line number	Diff line number	Diff line
		@@ -219,7 +219,6 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		private static final int EVENT_UNSOL_OEM_HOOK_RAW = 34;
		protected static final int EVENT_GET_RADIO_CAPABILITY = 35;
		protected static final int EVENT_SS = 36;
		private static final int EVENT_CONFIG_LCE = 37;
		private static final int EVENT_CHECK_FOR_NETWORK_AUTOMATIC = 38;
		protected static final int EVENT_VOICE_RADIO_TECH_CHANGED = 39;
		protected static final int EVENT_REQUEST_VOICE_RADIO_TECH_DONE = 40;
		@@ -371,9 +370,6 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		private final AtomicReference<RadioCapability> mRadioCapability =
		new AtomicReference<RadioCapability>();

		private static final int DEFAULT_REPORT_INTERVAL_MS = 200;
		private static final boolean LCE_PULL_MODE = true;
		private int mLceStatus = RILConstants.LCE_NOT_AVAILABLE;
		protected TelephonyComponentFactory mTelephonyComponentFactory;

		private int mPreferredUsageSetting = SubscriptionManager.USAGE_SETTING_UNKNOWN;
		@@ -649,8 +645,6 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		if (getPhoneType() != PhoneConstants.PHONE_TYPE_SIP) {
		mCi.registerForSrvccStateChanged(this, EVENT_SRVCC_STATE_CHANGED, null);
		}
		mCi.startLceService(DEFAULT_REPORT_INTERVAL_MS, LCE_PULL_MODE,
		obtainMessage(EVENT_CONFIG_LCE));
		}

		/**
		@@ -808,16 +802,6 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		// deprecated, ignore
		break;

		case EVENT_CONFIG_LCE:
		ar = (AsyncResult) msg.obj;
		if (ar.exception != null) {
		Rlog.d(LOG_TAG, "config LCE service failed: " + ar.exception);
		} else {
		final ArrayList<Integer> statusInfo = (ArrayList<Integer>)ar.result;
		mLceStatus = statusInfo.get(0);
		}
		break;

		case EVENT_CHECK_FOR_NETWORK_AUTOMATIC: {
		onCheckForNetworkSelectionModeAutomatic(msg);
		break;
		@@ -2720,47 +2704,6 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		mCi.queryAvailableBandMode(response);
		}

		/**
		* Invokes RIL_REQUEST_OEM_HOOK_RAW on RIL implementation.
		*
		* @param data The data for the request.
		* @param response <strong>On success</strong>,
		* (byte[])(((AsyncResult)response.obj).result)
		* <strong>On failure</strong>,
		* (((AsyncResult)response.obj).result) == null and
		* (((AsyncResult)response.obj).exception) being an instance of
		* com.android.internal.telephony.gsm.CommandException
		*
		* @see #invokeOemRilRequestRaw(byte[], android.os.Message)
		* @deprecated OEM needs a vendor-extension hal and their apps should use that instead
		*/
		@UnsupportedAppUsage
		@Deprecated
		public void invokeOemRilRequestRaw(byte[] data, Message response) {
		mCi.invokeOemRilRequestRaw(data, response);
		}

		/**
		* Invokes RIL_REQUEST_OEM_HOOK_Strings on RIL implementation.
		*
		* @param strings The strings to make available as the request data.
		* @param response <strong>On success</strong>, "response" bytes is
		* made available as:
		* (String[])(((AsyncResult)response.obj).result).
		* <strong>On failure</strong>,
		* (((AsyncResult)response.obj).result) == null and
		* (((AsyncResult)response.obj).exception) being an instance of
		* com.android.internal.telephony.gsm.CommandException
		*
		* @see #invokeOemRilRequestStrings(java.lang.String[], android.os.Message)
		* @deprecated OEM needs a vendor-extension hal and their apps should use that instead
		*/
		@UnsupportedAppUsage
		@Deprecated
		public void invokeOemRilRequestStrings(String[] strings, Message response) {
		mCi.invokeOemRilRequestStrings(strings, response);
		}

		/**
		* Read one of the NV items defined in {@link RadioNVItems} / {@code ril_nv_items.h}.
		* Used for device configuration by some CDMA operators.
		@@ -4523,13 +4466,6 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		return false;
		}

		/**
		* Returns the status of Link Capacity Estimation (LCE) service.
		*/
		public int getLceStatus() {
		return mLceStatus;
		}

		/**
		* Returns the modem activity information
		*/
		@@ -4537,15 +4473,6 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		mCi.getModemActivityInfo(response, workSource);
		}

		/**
		* Starts LCE service after radio becomes available.
		* LCE service state may get destroyed on the modem when radio becomes unavailable.
		*/
		public void startLceAfterRadioIsAvailable() {
		mCi.startLceService(DEFAULT_REPORT_INTERVAL_MS, LCE_PULL_MODE,
		obtainMessage(EVENT_CONFIG_LCE));
		}

		/**
		* Control the data throttling at modem.
		*

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

+5 −107

Original line number	Diff line number	Diff line
		@@ -1334,16 +1334,6 @@ public class RIL extends BaseCommands implements CommandsInterface {
		});
		}

		@Override
		public void getIccSlotsStatus(Message result) {
		// TODO(b/280900995): remove this and references
		}

		@Override
		public void setLogicalToPhysicalSlotMapping(int[] physicalSlots, Message result) {
		// TODO(b/280900995): remove this and references
		}

		@Override
		public void supplyIccPin(String pin, Message result) {
		supplyIccPinForApp(pin, null, result);
		@@ -1533,7 +1523,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
		}
		RadioSimProxy simProxy = getRadioServiceProxy(RadioSimProxy.class);
		if (!canMakeRequest("supplySimDepersonalization", simProxy, result,
		RADIO_HAL_VERSION_1_4)) {
		RADIO_HAL_VERSION_1_5)) {
		return;
		}

		@@ -2050,9 +2040,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
		}

		@Override
		public void setupDataCall(int accessNetworkType, DataProfile dataProfile,
		boolean isRoaming /* unused */, boolean allowRoaming, int reason,
		LinkProperties linkProperties, int pduSessionId, NetworkSliceInfo sliceInfo,
		public void setupDataCall(int accessNetworkType, DataProfile dataProfile, boolean allowRoaming,
		int reason, LinkProperties linkProperties, int pduSessionId, NetworkSliceInfo sliceInfo,
		TrafficDescriptor trafficDescriptor, boolean matchAllRuleAllowed, Message result) {
		RadioDataProxy dataProxy = getRadioServiceProxy(RadioDataProxy.class);
		if (!canMakeRequest("setupDataCall", dataProxy, result, RADIO_HAL_VERSION_1_4)) {
		@@ -2682,16 +2671,6 @@ public class RIL extends BaseCommands implements CommandsInterface {
		});
		}

		/**
		* @deprecated
		*/
		@Override
		@Deprecated
		public void getPDPContextList(Message result) {
		// TODO(b/280900995): remove this and references
		getDataCallList(result);
		}

		@Override
		public void getDataCallList(Message result) {
		RadioDataProxy dataProxy = getRadioServiceProxy(RadioDataProxy.class);
		@@ -2710,17 +2689,6 @@ public class RIL extends BaseCommands implements CommandsInterface {
		});
		}

		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		@Override
		public void invokeOemRilRequestRaw(byte[] data, Message response) {
		// TODO(b/280900995): remove this and references
		}

		@Override
		public void invokeOemRilRequestStrings(String[] strings, Message result) {
		// TODO(b/280900995): remove this and references
		}

		@Override
		public void setSuppServiceNotifications(boolean enable, Message result) {
		RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class);
		@@ -3811,8 +3779,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
		}

		@Override
		public void setInitialAttachApn(DataProfile dataProfile, boolean isRoaming /* unused */,
		Message result) {
		public void setInitialAttachApn(DataProfile dataProfile, Message result) {
		RadioDataProxy dataProxy = getRadioServiceProxy(RadioDataProxy.class);
		if (!canMakeRequest("setInitialAttachApn", dataProxy, result, RADIO_HAL_VERSION_1_4)) {
		return;
		@@ -4100,17 +4067,6 @@ public class RIL extends BaseCommands implements CommandsInterface {
		});
		}

		/**
		* Whether the device modem supports reporting the EID in either the slot or card status or
		* through ATR.
		* @return true if the modem supports EID.
		*/
		@Override
		public boolean supportsEid() {
		// TODO(b/280900995): remove this and references
		return true;
		}

		@Override
		public void setDataAllowed(boolean allowed, Message result) {
		RadioDataProxy dataProxy = getRadioServiceProxy(RadioDataProxy.class);
		@@ -4175,7 +4131,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
		}

		@Override
		public void setDataProfile(DataProfile[] dps, boolean isRoaming /* unused */, Message result) {
		public void setDataProfile(DataProfile[] dps, Message result) {
		RadioDataProxy dataProxy = getRadioServiceProxy(RadioDataProxy.class);
		if (!canMakeRequest("setDataProfile", dataProxy, result, RADIO_HAL_VERSION_1_4)) {
		return;
		@@ -4253,16 +4209,6 @@ public class RIL extends BaseCommands implements CommandsInterface {
		});
		}

		@Override
		public void startLceService(int reportIntervalMs, boolean pullMode, Message result) {
		// TODO(b/280900995): remove this and references
		}

		@Override
		public void stopLceService(Message result) {
		// TODO(b/280900995): remove this and references
		}

		/**
		* Control the data throttling at modem.
		*
		@@ -4295,22 +4241,6 @@ public class RIL extends BaseCommands implements CommandsInterface {
		});
		}

		/**
		* This will only be called if the LCE service is started in PULL mode, which is
		* only enabled when using Radio HAL versions 1.1 and earlier.
		*
		* It is still possible for vendors to override this behavior and use the 1.1 version
		* of LCE; however, this is strongly discouraged and this functionality will be removed
		* when HAL 1.x support is dropped.
		*
		* @deprecated HAL 1.2 and later use an always-on LCE that relies on indications.
		*/
		@Deprecated
		@Override
		public void pullLceData(Message result) {
		// TODO(b/280900995): remove this and references
		}

		@Override
		public void getModemActivityInfo(Message result, WorkSource workSource) {
		RadioModemProxy modemProxy = getRadioServiceProxy(RadioModemProxy.class);
		@@ -4541,33 +4471,6 @@ public class RIL extends BaseCommands implements CommandsInterface {
		});
		}

		@Override
		public void getIMEI(Message result) {
		// TODO(b/280900995): remove this and references
		}

		@Override
		public void getIMEISV(Message result) {
		// TODO(b/280900995): remove this and references
		}

		/**
		* @deprecated
		*/
		@Deprecated
		@Override
		public void getLastPdpFailCause(Message result) {
		// TODO(b/280900995): remove this and references
		}

		/**
		* The preferred new alternative to getLastPdpFailCause
		*/
		@Override
		public void getLastDataCallFailCause(Message result) {
		// TODO(b/280900995): remove this and references
		}

		/**
		* Enable or disable uicc applications on the SIM.
		*
		@@ -4628,11 +4531,6 @@ public class RIL extends BaseCommands implements CommandsInterface {
		getRadioServiceProxy(RadioSimProxy.class), null, RADIO_HAL_VERSION_1_5);
		}

		@Override
		public void resetRadio(Message result) {
		// TODO(b/280900995): remove this and references
		}

		/**
		* {@inheritDoc}
		*/