Merge "Add signal strength converter" am: 5d0a87bcab (6c76032c) · Commits · e / os / android_frameworks_opt_telephony

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

+9 −1

Original line number	Diff line number	Diff line
		@@ -1523,7 +1523,15 @@ public class RIL extends BaseCommands implements CommandsInterface {

		if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest));

		if (mRadioVersion.greaterOrEqual(RADIO_HAL_VERSION_1_4)) {
		if (mRadioVersion.greaterOrEqual(RADIO_HAL_VERSION_1_6)) {
		android.hardware.radio.V1_6.IRadio radioProxy16 =
		(android.hardware.radio.V1_6.IRadio) radioProxy;
		try {
		radioProxy16.getSignalStrength_1_6(rr.mSerial);
		} catch (RemoteException \| RuntimeException e) {
		handleRadioProxyExceptionForRR(rr, "getSignalStrength_1_6", e);
		}
		} else if (mRadioVersion.greaterOrEqual(RADIO_HAL_VERSION_1_4)) {
		android.hardware.radio.V1_4.IRadio radioProxy14 =
		(android.hardware.radio.V1_4.IRadio) radioProxy;
		try {

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

+17 −0

Original line number	Diff line number	Diff line
		@@ -312,6 +312,23 @@ public class RadioIndication extends IRadioIndication.Stub {
		}
		}

		/**
		* Indicates the current signal strength of the camped or primary serving cell.
		*/
		public void currentSignalStrength_1_6(int indicationType,
		android.hardware.radio.V1_6.SignalStrength signalStrength) {

		mRil.processIndication(indicationType);

		SignalStrength ss = new SignalStrength(signalStrength);

		if (RIL.RILJ_LOGV) mRil.unsljLogvRet(RIL_UNSOL_SIGNAL_STRENGTH, ss);

		if (mRil.mSignalStrengthRegistrant != null) {
		mRil.mSignalStrengthRegistrant.notifyRegistrant(new AsyncResult(null, ss, null));
		}
		}

		/**
		* Indicates current physical channel configuration.
		*/

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

+25 −0

Original line number	Diff line number	Diff line
		@@ -308,6 +308,7 @@ public class RadioResponse extends IRadioResponse.Stub {
		android.hardware.radio.V1_2.SignalStrength signalStrength) {
		responseSignalStrength_1_2(responseInfo, signalStrength);
		}

		/**
		* @param responseInfo Response info struct containing response type, serial no. and error
		* @param signalStrength Current signal strength of camped/connected cells
		@@ -318,6 +319,16 @@ public class RadioResponse extends IRadioResponse.Stub {
		responseSignalStrength_1_4(responseInfo, signalStrength);
		}

		/**
		* @param responseInfo Response info struct containing response type, serial no. and error
		* @param signalStrength Current signal strength of camped/connected cells
		*/
		public void getSignalStrengthResponse_1_6(
		android.hardware.radio.V1_6.RadioResponseInfo responseInfo,
		android.hardware.radio.V1_6.SignalStrength signalStrength) {
		responseSignalStrength_1_6(responseInfo, signalStrength);
		}

		/**
		* @param responseInfo Response info struct containing response type, serial no. and error
		* @param voiceRegResponse Current Voice registration response as defined by VoiceRegStateResult
		@@ -2328,6 +2339,20 @@ public class RadioResponse extends IRadioResponse.Stub {
		}
		}

		private void responseSignalStrength_1_6(
		android.hardware.radio.V1_6.RadioResponseInfo responseInfo,
		android.hardware.radio.V1_6.SignalStrength signalStrength) {
		RILRequest rr = mRil.processResponse_1_6(responseInfo);

		if (rr != null) {
		SignalStrength ret = new SignalStrength(signalStrength);
		if (responseInfo.error == RadioError.NONE) {
		sendMessageResponse(rr.mResult, ret);
		}
		mRil.processResponseDone_1_6(rr, responseInfo, ret);
		}
		}

		private void responseSms(RadioResponseInfo responseInfo, SendSmsResult sms) {
		RILRequest rr = mRil.processResponse(responseInfo);