Merge "CellSignalStrength cleanup" am: af7435ca1f am: 67a2db0a66 (4c6be5b5) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/CellSignalStrengthCdma.java

+9 −42

Original line number	Diff line number	Diff line
		@@ -36,48 +36,14 @@ public final class CellSignalStrengthCdma extends CellSignalStrength implements
		private int mEvdoEcio; // This value is the EVDO Ec/Io
		private int mEvdoSnr; // Valid values are 0-8. 8 is the highest signal to noise ratio

		/**
		* Empty constructor
		*
		* @hide
		*/
		/** @hide */
		public CellSignalStrengthCdma() {
		setDefaultValues();
		}

		/**
		* Constructor
		*
		* @hide
		*/
		/** @hide */
		public CellSignalStrengthCdma(int cdmaDbm, int cdmaEcio, int evdoDbm, int evdoEcio,
		int evdoSnr) {
		initialize(cdmaDbm, cdmaEcio, evdoDbm, evdoEcio, evdoSnr);
		}

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

		/**
		* Initialize all the values
		*
		* @param cdmaDbm
		* @param cdmaEcio
		* @param evdoDbm
		* @param evdoEcio
		* @param evdoSnr
		*
		* @hide
		*/
		public void initialize(int cdmaDbm, int cdmaEcio, int evdoDbm, int evdoEcio, int evdoSnr) {
		mCdmaDbm = cdmaDbm;
		mCdmaEcio = cdmaEcio;
		mEvdoDbm = evdoDbm;
		@@ -85,9 +51,12 @@ public final class CellSignalStrengthCdma extends CellSignalStrength implements
		mEvdoSnr = evdoSnr;
		}

		/**
		* @hide
		*/
		/** @hide */
		public CellSignalStrengthCdma(CellSignalStrengthCdma s) {
		copyFrom(s);
		}

		/** @hide */
		protected void copyFrom(CellSignalStrengthCdma s) {
		mCdmaDbm = s.mCdmaDbm;
		mCdmaEcio = s.mCdmaEcio;
		@@ -96,9 +65,7 @@ public final class CellSignalStrengthCdma extends CellSignalStrength implements
		mEvdoSnr = s.mEvdoSnr;
		}

		/**
		* @hide
		*/
		/** @hide */
		@Override
		public CellSignalStrengthCdma copy() {
		return new CellSignalStrengthCdma(this);

telephony/java/android/telephony/CellSignalStrengthGsm.java

+13 −53

Original line number	Diff line number	Diff line
		@@ -34,80 +34,40 @@ public final class CellSignalStrengthGsm extends CellSignalStrength implements P
		private static final int GSM_SIGNAL_STRENGTH_GOOD = 8;
		private static final int GSM_SIGNAL_STRENGTH_MODERATE = 5;

		private int mSignalStrength; // Valid values are (0-31, 99) as defined in TS 27.007 8.5
		private int mSignalStrength; // in ASU; Valid values are (0-31, 99) as defined in TS 27.007 8.5
		private int mBitErrorRate; // bit error rate (0-7, 99) as defined in TS 27.007 8.5
		private int mTimingAdvance;
		private int mTimingAdvance; // range from 0-219 or Integer.MAX_VALUE if unknown

		/**
		* Empty constructor
		*
		* @hide
		*/
		/** @hide */
		public CellSignalStrengthGsm() {
		setDefaultValues();
		}

		/**
		* Constructor
		*
		* @hide
		*/
		/** @hide */
		public CellSignalStrengthGsm(int ss, int ber) {
		initialize(ss, ber);
		}

		/**
		* Copy constructors
		*
		* @param s Source SignalStrength
		*
		* @hide
		*/
		public CellSignalStrengthGsm(CellSignalStrengthGsm s) {
		copyFrom(s);
		this(ss, ber, Integer.MAX_VALUE);
		}

		/**
		* Initialize all the values
		*
		* @param ss SignalStrength as ASU value
		* @param ber is Bit Error Rate
		*
		* @hide
		*/
		public void initialize(int ss, int ber) {
		/** @hide */
		public CellSignalStrengthGsm(int ss, int ber, int ta) {
		mSignalStrength = ss;
		mBitErrorRate = ber;
		mTimingAdvance = Integer.MAX_VALUE;
		mTimingAdvance = ta;
		}

		/**
		* Initialize all the values
		*
		* @param ss SignalStrength as ASU value
		* @param ber is Bit Error Rate
		* @param ta timing advance
		*
		* @hide
		*/
		public void initialize(int ss, int ber, int ta) {
		mSignalStrength = ss;
		mBitErrorRate = ber;
		mTimingAdvance = ta;
		/** @hide */
		public CellSignalStrengthGsm(CellSignalStrengthGsm s) {
		copyFrom(s);
		}

		/**
		* @hide
		*/
		/** @hide */
		protected void copyFrom(CellSignalStrengthGsm s) {
		mSignalStrength = s.mSignalStrength;
		mBitErrorRate = s.mBitErrorRate;
		mTimingAdvance = s.mTimingAdvance;
		}

		/**
		* @hide
		*/
		/** @hide */
		@Override
		public CellSignalStrengthGsm copy() {
		return new CellSignalStrengthGsm(this);

telephony/java/android/telephony/CellSignalStrengthLte.java

+8 −58

Original line number	Diff line number	Diff line
		@@ -37,50 +37,15 @@ public final class CellSignalStrengthLte extends CellSignalStrength implements P
		private int mCqi;
		private int mTimingAdvance;

		/**
		* Empty constructor
		*
		* @hide
		*/
		/** @hide */
		public CellSignalStrengthLte() {
		setDefaultValues();
		}

		/**
		* Constructor
		*
		* @hide
		*/
		/** @hide */
		public CellSignalStrengthLte(int signalStrength, int rsrp, int rsrq, int rssnr, int cqi,
		int timingAdvance) {
		initialize(signalStrength, rsrp, rsrq, rssnr, cqi, timingAdvance);
		}

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

		/**
		* Initialize all the values
		*
		* @param lteSignalStrength
		* @param rsrp
		* @param rsrq
		* @param rssnr
		* @param cqi
		*
		* @hide
		*/
		public void initialize(int lteSignalStrength, int rsrp, int rsrq, int rssnr, int cqi,
		int timingAdvance) {
		mSignalStrength = lteSignalStrength;
		mSignalStrength = signalStrength;
		mRsrp = rsrp;
		mRsrq = rsrq;
		mRssnr = rssnr;
		@@ -88,25 +53,12 @@ public final class CellSignalStrengthLte extends CellSignalStrength implements P
		mTimingAdvance = timingAdvance;
		}

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

		/**
		* @hide
		*/
		/** @hide */
		protected void copyFrom(CellSignalStrengthLte s) {
		mSignalStrength = s.mSignalStrength;
		mRsrp = s.mRsrp;
		@@ -116,9 +68,7 @@ public final class CellSignalStrengthLte extends CellSignalStrength implements P
		mTimingAdvance = s.mTimingAdvance;
		}

		/**
		* @hide
		*/
		/** @hide */
		@Override
		public CellSignalStrengthLte copy() {
		return new CellSignalStrengthLte(this);

telephony/java/android/telephony/CellSignalStrengthWcdma.java

+9 −39

Original line number	Diff line number	Diff line
		@@ -34,62 +34,32 @@ public final class CellSignalStrengthWcdma extends CellSignalStrength implements
		private static final int WCDMA_SIGNAL_STRENGTH_GOOD = 8;
		private static final int WCDMA_SIGNAL_STRENGTH_MODERATE = 5;

		private int mSignalStrength; // Valid values are (0-31, 99) as defined in TS 27.007 8.5
		private int mSignalStrength; // in ASU; Valid values are (0-31, 99) as defined in TS 27.007 8.5
		private int mBitErrorRate; // bit error rate (0-7, 99) as defined in TS 27.007 8.5

		/**
		* Empty constructor
		*
		* @hide
		*/
		/** @hide */
		public CellSignalStrengthWcdma() {
		setDefaultValues();
		}

		/**
		* Constructor
		*
		* @hide
		*/
		/** @hide */
		public CellSignalStrengthWcdma(int ss, int ber) {
		initialize(ss, ber);
		mSignalStrength = ss;
		mBitErrorRate = ber;
		}

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

		/**
		* Initialize all the values
		*
		* @param ss SignalStrength as ASU value
		* @param ber is Bit Error Rate
		*
		* @hide
		*/
		public void initialize(int ss, int ber) {
		mSignalStrength = ss;
		mBitErrorRate = ber;
		}

		/**
		* @hide
		*/
		/** @hide */
		protected void copyFrom(CellSignalStrengthWcdma s) {
		mSignalStrength = s.mSignalStrength;
		mBitErrorRate = s.mBitErrorRate;
		}

		/**
		* @hide
		*/
		/** @hide */
		@Override
		public CellSignalStrengthWcdma copy() {
		return new CellSignalStrengthWcdma(this);