Merge "Fix build." into jb-mr1-dev (ae5ac108) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/CellSignalStrengthLte.java

+16 −0

Original line number	Diff line number	Diff line
		@@ -86,6 +86,22 @@ public class CellSignalStrengthLte extends CellSignalStrength implements Parcela
		mTimingAdvance = timingAdvance;
		}

		/**
		* Initialize from the SignalStrength structure.
		*
		* @param ss
		*
		* @hide
		*/
		public void initialize(SignalStrength ss, int timingAdvance) {
		mSignalStrength = ss.getLteSignalStrenght();
		mRsrp = ss.getLteRsrp();
		mRsrq = ss.getLteRsrq();
		mRssnr = ss.getLteRssnr();
		mCqi = ss.getLteCqi();
		mTimingAdvance = timingAdvance;
		}

		/**
		* @hide
		*/

telephony/java/android/telephony/SignalStrength.java

+105 −0

Original line number	Diff line number	Diff line
		@@ -64,6 +64,7 @@ public class SignalStrength implements Parcelable {
		private int mLteCqi;

		private boolean isGsm; // This value is set by the ServiceStateTracker onSignalStrengthResult

		/**
		* Create a new SignalStrength from a intent notifier Bundle
		*
		@@ -133,6 +134,83 @@ public class SignalStrength implements Parcelable {
		* @hide
		*/
		public SignalStrength(int gsmSignalStrength, int gsmBitErrorRate,
		int cdmaDbm, int cdmaEcio,
		int evdoDbm, int evdoEcio, int evdoSnr,
		int lteSignalStrength, int lteRsrp, int lteRsrq, int lteRssnr, int lteCqi,
		boolean gsmFlag) {
		initialize(gsmSignalStrength, gsmBitErrorRate, cdmaDbm, cdmaEcio,
		evdoDbm, evdoEcio, evdoSnr, lteSignalStrength, lteRsrp,
		lteRsrq, lteRssnr, lteCqi, gsmFlag);
		}

		/**
		* Constructor
		*
		* @hide
		*/
		public SignalStrength(int gsmSignalStrength, int gsmBitErrorRate,
		int cdmaDbm, int cdmaEcio,
		int evdoDbm, int evdoEcio, int evdoSnr,
		boolean gsmFlag) {
		initialize(gsmSignalStrength, gsmBitErrorRate, cdmaDbm, cdmaEcio,
		evdoDbm, evdoEcio, evdoSnr, 99, INVALID,
		INVALID, INVALID, INVALID, gsmFlag);
		}

		/**
		* Copy constructors
		*
		* @param s Source SignalStrength
		*
		* @hide
		*/
		public SignalStrength(SignalStrength s) {
		copyFrom(s);
		}

		/**
		* Initialize gsm/cdma values, sets lte values to defaults.
		*
		* @param gsmSignalStrength
		* @param gsmBitErrorRate
		* @param cdmaDbm
		* @param cdmaEcio
		* @param evdoDbm
		* @param evdoEcio
		* @param evdoSnr
		* @param gsm
		*
		* @hide
		*/
		public void initialize(int gsmSignalStrength, int gsmBitErrorRate,
		int cdmaDbm, int cdmaEcio,
		int evdoDbm, int evdoEcio, int evdoSnr,
		boolean gsm) {
		initialize(gsmSignalStrength, gsmBitErrorRate, cdmaDbm, cdmaEcio,
		evdoDbm, evdoEcio, evdoSnr, 99, INVALID,
		INVALID, INVALID, INVALID, gsm);
		}

		/**
		* Initialize all the values
		*
		* @param gsmSignalStrength
		* @param gsmBitErrorRate
		* @param cdmaDbm
		* @param cdmaEcio
		* @param evdoDbm
		* @param evdoEcio
		* @param evdoSnr
		* @param lteSignalStrength
		* @param lteRsrp
		* @param lteRsrq
		* @param lteRssnr
		* @param lteCqi
		* @param gsm
		*
		* @hide
		*/
		public void initialize(int gsmSignalStrength, int gsmBitErrorRate,
		int cdmaDbm, int cdmaEcio,
		int evdoDbm, int evdoEcio, int evdoSnr,
		int lteSignalStrength, int lteRsrp, int lteRsrq, int lteRssnr, int lteCqi,
		@@ -178,6 +256,8 @@ public class SignalStrength implements Parcelable {
		* @hide
		*/
		public SignalStrength(Parcel in) {
		if (DBG) log("Size of signalstrength parcel:" + in.dataSize());

		mGsmSignalStrength = in.readInt();
		mGsmBitErrorRate = in.readInt();
		mCdmaDbm = in.readInt();
		@@ -330,6 +410,31 @@ public class SignalStrength implements Parcelable {
		return this.mEvdoSnr;
		}

		/** @hide */
		public int getLteSignalStrenght() {
		return mLteSignalStrength;
		}

		/** @hide */
		public int getLteRsrp() {
		return mLteRsrp;
		}

		/** @hide */
		public int getLteRsrq() {
		return mLteRsrq;
		}

		/** @hide */
		public int getLteRssnr() {
		return mLteRssnr;
		}

		/** @hide */
		public int getLteCqi() {
		return mLteCqi;
		}

		/**
		* Get signal level as an int from 0..4
		*