Merge "Support multiple RANs per signal strength request in telephony" (39779ee0) · Commits · e / devices / smdk4412 / android_frameworks_opt_telephony

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

+11 −20

Original line number	Original line	Diff line number	Diff line
	@@ -17,6 +17,7 @@
	package com.android.internal.telephony;		package com.android.internal.telephony;

	import android.annotation.NonNull;		import android.annotation.NonNull;
			import android.annotation.Nullable;
	import android.compat.annotation.UnsupportedAppUsage;		import android.compat.annotation.UnsupportedAppUsage;
	import android.net.KeepalivePacketData;		import android.net.KeepalivePacketData;
	import android.net.LinkProperties;		import android.net.LinkProperties;
	@@ -2393,30 +2394,20 @@ public interface CommandsInterface {
	void setUnsolResponseFilter(int filter, Message result);		void setUnsolResponseFilter(int filter, Message result);

	/**		/**
	* Sets the signal strength reporting criteria.		* Sets or clears the signal strength reporting criteria for multiple RANs in one request.
	*		*
	* The resulting reporting rules are the AND of all the supplied criteria. For each RAN		* The reporting criteria are set individually for each combination of RAN and measurement type.
	* The hysteresisDb and thresholds apply to only the following measured quantities:		* For each RAN type, if no reporting criteria are set, then the reporting of SignalStrength for
	* -GERAN - RSSI		* that RAN is implementation-defined. If any criteria are supplied for a RAN type, then
	* -CDMA2000 - RSSI		* SignalStrength is only reported as specified by those criteria. For any RAN types not defined
	* -UTRAN - RSCP		* by this HAL, reporting is implementation-defined.
	* -EUTRAN - RSRP/RSRQ/RSSNR
	* -NGRAN - SSRSRP/SSRSRQ/SSSINR
	*		*
	* Note: Reporting criteria must be individually set for each RAN. For any unset reporting		* @param signalThresholdInfos Collection of SignalThresholdInfo specifying the reporting
	* criteria, the value is implementation-defined.		* criteria. See SignalThresholdInfo for details.
	*
	* Response callback is
	* IRadioResponse.setSignalStrengthReportingCriteriaResponse_1_5()
	*
	* @param signalThresholdInfo Signal threshold info including the threshold values,
	* hysteresisDb, and hysteresisMs. See @1.5::SignalThresholdInfo
	* for details.
	* @param ran The type of network for which to apply these thresholds.
	* @param result callback message contains the information of SUCCESS/FAILURE		* @param result callback message contains the information of SUCCESS/FAILURE
	*/		*/
	void setSignalStrengthReportingCriteria(SignalThresholdInfo signalThresholdInfo, int ran,		void setSignalStrengthReportingCriteria(@NonNull List<SignalThresholdInfo> signalThresholdInfos,
	Message result);		@Nullable Message result);

	/**		/**
	* Send the link capacity reporting criteria to the modem		* Send the link capacity reporting criteria to the modem

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

+1 −32

Original line number	Original line	Diff line number	Diff line
	@@ -75,7 +75,6 @@ import android.telephony.PhoneNumberUtils;
	import android.telephony.RadioAccessFamily;		import android.telephony.RadioAccessFamily;
	import android.telephony.ServiceState;		import android.telephony.ServiceState;
	import android.telephony.ServiceState.RilRadioTechnology;		import android.telephony.ServiceState.RilRadioTechnology;
	import android.telephony.SignalThresholdInfo;
	import android.telephony.SubscriptionInfo;		import android.telephony.SubscriptionInfo;
	import android.telephony.SubscriptionManager;		import android.telephony.SubscriptionManager;
	import android.telephony.TelephonyManager;		import android.telephony.TelephonyManager;
	@@ -145,11 +144,9 @@ public class GsmCdmaPhone extends Phone {
	private static final boolean DBG = true;		private static final boolean DBG = true;
	private static final boolean VDBG = false; /* STOPSHIP if true */		private static final boolean VDBG = false; /* STOPSHIP if true */

	/** Required magnitude change between unsolicited SignalStrength reports. */
	private static final int REPORTING_HYSTERESIS_DB = 2;
	/** Required throughput change between unsolicited LinkCapacityEstimate reports. */		/** Required throughput change between unsolicited LinkCapacityEstimate reports. */
	private static final int REPORTING_HYSTERESIS_KBPS = 50;		private static final int REPORTING_HYSTERESIS_KBPS = 50;
	/** Minimum time between unsolicited SignalStrength and LinkCapacityEstimate reports. */		/** Minimum time between unsolicited LinkCapacityEstimate reports. */
	private static final int REPORTING_HYSTERESIS_MILLIS = 3000;		private static final int REPORTING_HYSTERESIS_MILLIS = 3000;

	//GSM		//GSM
	@@ -4186,34 +4183,6 @@ public class GsmCdmaPhone extends Phone {
	}		}
	}		}

	@Override
	public void setSignalStrengthReportingCriteria(int signalStrengthMeasure,
	int[] systemThresholds, int ran, boolean isEnabledForSystem) {
	int[] consolidatedThresholds = mSignalStrengthController.getConsolidatedSignalThresholds(
	ran,
	signalStrengthMeasure,
	isEnabledForSystem && mSignalStrengthController.shouldHonorSystemThresholds()
	? systemThresholds
	: new int[]{},
	REPORTING_HYSTERESIS_DB);
	boolean isEnabledForAppRequest =
	mSignalStrengthController.shouldEnableSignalThresholdForAppRequest(
	ran,
	signalStrengthMeasure,
	getSubId(),
	isDeviceIdle());
	mCi.setSignalStrengthReportingCriteria(
	new SignalThresholdInfo.Builder()
	.setRadioAccessNetworkType(ran)
	.setSignalMeasurementType(signalStrengthMeasure)
	.setHysteresisMs(REPORTING_HYSTERESIS_MILLIS)
	.setHysteresisDb(REPORTING_HYSTERESIS_DB)
	.setThresholds(consolidatedThresholds, true /isSystem/)
	.setIsEnabled(isEnabledForSystem \|\| isEnabledForAppRequest)
	.build(),
	ran, null);
	}

	@Override		@Override
	public void setLinkCapacityReportingCriteria(int[] dlThresholds, int[] ulThresholds, int ran) {		public void setLinkCapacityReportingCriteria(int[] dlThresholds, int[] ulThresholds, int ran) {
	mCi.setLinkCapacityReportingCriteria(REPORTING_HYSTERESIS_MILLIS, REPORTING_HYSTERESIS_KBPS,		mCi.setLinkCapacityReportingCriteria(REPORTING_HYSTERESIS_MILLIS, REPORTING_HYSTERESIS_KBPS,

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

+0 −6

Original line number	Original line	Diff line number	Diff line
	@@ -4541,12 +4541,6 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
	mCi.setAllowedCarriers(carrierRestrictionRules, response, workSource);		mCi.setAllowedCarriers(carrierRestrictionRules, response, workSource);
	}		}

	/** Sets the SignalStrength reporting criteria. */
	public void setSignalStrengthReportingCriteria(
	int signalStrengthMeasure, int[] thresholds, int ran, boolean isEnabled) {
	// no-op default implementation
	}

	/** Sets the SignalStrength reporting criteria. */		/** Sets the SignalStrength reporting criteria. */
	public void setLinkCapacityReportingCriteria(int[] dlThresholds, int[] ulThresholds, int ran) {		public void setLinkCapacityReportingCriteria(int[] dlThresholds, int[] ulThresholds, int ran) {
	// no-op default implementation		// no-op default implementation

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

+3 −4

Original line number	Original line	Diff line number	Diff line
	@@ -4458,8 +4458,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
	}		}

	@Override		@Override
	public void setSignalStrengthReportingCriteria(SignalThresholdInfo signalThresholdInfo,		public void setSignalStrengthReportingCriteria(
	int ran, Message result) {		@NonNull List<SignalThresholdInfo> signalThresholdInfos, @Nullable Message result) {
	RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class, result);		RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class, result);
	if (networkProxy.isEmpty()) return;		if (networkProxy.isEmpty()) return;
	if (mRadioVersion.greaterOrEqual(RADIO_HAL_VERSION_1_2)) {		if (mRadioVersion.greaterOrEqual(RADIO_HAL_VERSION_1_2)) {
	@@ -4471,8 +4471,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
	}		}

	try {		try {
	networkProxy.setSignalStrengthReportingCriteria(rr.mSerial, signalThresholdInfo,		networkProxy.setSignalStrengthReportingCriteria(rr.mSerial, signalThresholdInfos);
	ran);
	} catch (RemoteException \| RuntimeException e) {		} catch (RemoteException \| RuntimeException e) {
	handleRadioProxyExceptionForRR(NETWORK_SERVICE,		handleRadioProxyExceptionForRR(NETWORK_SERVICE,
	"setSignalStrengthReportingCriteria", e);		"setSignalStrengthReportingCriteria", e);

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

+27 −17

Original line number	Original line	Diff line number	Diff line
	@@ -18,6 +18,7 @@ package com.android.internal.telephony;

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

			import android.annotation.NonNull;
	import android.os.AsyncResult;		import android.os.AsyncResult;
	import android.os.Message;		import android.os.Message;
	import android.os.RemoteException;		import android.os.RemoteException;
	@@ -587,30 +588,39 @@ public class RadioNetworkProxy extends RadioServiceProxy {
	/**		/**
	* Call IRadioNetwork#setSignalStrengthReportingCriteria		* Call IRadioNetwork#setSignalStrengthReportingCriteria
	* @param serial Serial number of request		* @param serial Serial number of request
	* @param signalThresholdInfo Signal threshold info including the threshold values,		* @param signalThresholdInfos a list of {@link SignalThresholdInfo} to set with.
	* hysteresisDb, and hysteresisMs.
	* @param ran Radio access network for which to apply these thresholds
	* @throws RemoteException		* @throws RemoteException
	*/		*/
	public void setSignalStrengthReportingCriteria(int serial,		public void setSignalStrengthReportingCriteria(int serial,
	SignalThresholdInfo signalThresholdInfo, int ran) throws RemoteException {		@NonNull List<SignalThresholdInfo> signalThresholdInfos) throws RemoteException {
	if (isEmpty() \|\| mHalVersion.less(RIL.RADIO_HAL_VERSION_1_2)) return;		if (isEmpty() \|\| mHalVersion.less(RIL.RADIO_HAL_VERSION_1_2)) return;
	if (isAidl()) {		if (isAidl()) {
	mNetworkProxy.setSignalStrengthReportingCriteria(serial,		android.hardware.radio.network.SignalThresholdInfo[] halSignalThresholdsInfos =
	new android.hardware.radio.network.SignalThresholdInfo[] {		new android.hardware.radio.network.SignalThresholdInfo[signalThresholdInfos.size()];
	RILUtils.convertToHalSignalThresholdInfoAidl(signalThresholdInfo)});		for (int i = 0; i < signalThresholdInfos.size(); i++) {
			halSignalThresholdsInfos[i] = RILUtils.convertToHalSignalThresholdInfoAidl(
			signalThresholdInfos.get(i));
			}
			mNetworkProxy.setSignalStrengthReportingCriteria(serial, halSignalThresholdsInfos);
	} else if (mHalVersion.greaterOrEqual(RIL.RADIO_HAL_VERSION_1_5)) {		} else if (mHalVersion.greaterOrEqual(RIL.RADIO_HAL_VERSION_1_5)) {
			for (SignalThresholdInfo signalThresholdInfo : signalThresholdInfos) {
	((android.hardware.radio.V1_5.IRadio) mRadioProxy)		((android.hardware.radio.V1_5.IRadio) mRadioProxy)
	.setSignalStrengthReportingCriteria_1_5(serial,		.setSignalStrengthReportingCriteria_1_5(serial,
	RILUtils.convertToHalSignalThresholdInfo(signalThresholdInfo),		RILUtils.convertToHalSignalThresholdInfo(signalThresholdInfo),
	RILUtils.convertToHalAccessNetwork(ran));		RILUtils.convertToHalAccessNetwork(
			signalThresholdInfo.getRadioAccessNetworkType()));
			}
	} else {		} else {
			for (SignalThresholdInfo signalThresholdInfo : signalThresholdInfos) {
	((android.hardware.radio.V1_2.IRadio) mRadioProxy)		((android.hardware.radio.V1_2.IRadio) mRadioProxy)
	.setSignalStrengthReportingCriteria(serial,		.setSignalStrengthReportingCriteria(serial,
	signalThresholdInfo.getHysteresisMs(),		signalThresholdInfo.getHysteresisMs(),
	signalThresholdInfo.getHysteresisDb(),		signalThresholdInfo.getHysteresisDb(),
	RILUtils.primitiveArrayToArrayList(signalThresholdInfo.getThresholds()),		RILUtils.primitiveArrayToArrayList(
	RILUtils.convertToHalAccessNetwork(ran));		signalThresholdInfo.getThresholds()),
			RILUtils.convertToHalAccessNetwork(
			signalThresholdInfo.getRadioAccessNetworkType()));
			}
	}		}
	}		}