Merge "Merge "CellSignalStrength cleanup" am: af7435ca1f am: 67a2db0a66 am: 252aeb18cb" (99812566) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/CellSignalStrengthCdma.java

+9 −42

Original line number	Original line	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 mEvdoEcio; // This value is the EVDO Ec/Io
	private int mEvdoSnr; // Valid values are 0-8. 8 is the highest signal to noise ratio		private int mEvdoSnr; // Valid values are 0-8. 8 is the highest signal to noise ratio

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

	/**		/** @hide */
	* Constructor
	*
	* @hide
	*/
	public CellSignalStrengthCdma(int cdmaDbm, int cdmaEcio, int evdoDbm, int evdoEcio,		public CellSignalStrengthCdma(int cdmaDbm, int cdmaEcio, int evdoDbm, int evdoEcio,
	int evdoSnr) {		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;		mCdmaDbm = cdmaDbm;
	mCdmaEcio = cdmaEcio;		mCdmaEcio = cdmaEcio;
	mEvdoDbm = evdoDbm;		mEvdoDbm = evdoDbm;
	@@ -85,9 +51,12 @@ public final class CellSignalStrengthCdma extends CellSignalStrength implements
	mEvdoSnr = evdoSnr;		mEvdoSnr = evdoSnr;
	}		}

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

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

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

telephony/java/android/telephony/CellSignalStrengthGsm.java

+13 −53

Original line number	Original line	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_GOOD = 8;
	private static final int GSM_SIGNAL_STRENGTH_MODERATE = 5;		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 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

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

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

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

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

	/**		/** @hide */
	* Initialize all the values		public CellSignalStrengthGsm(CellSignalStrengthGsm s) {
	*		copyFrom(s);
	* @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 */
	* @hide
	*/
	protected void copyFrom(CellSignalStrengthGsm s) {		protected void copyFrom(CellSignalStrengthGsm s) {
	mSignalStrength = s.mSignalStrength;		mSignalStrength = s.mSignalStrength;
	mBitErrorRate = s.mBitErrorRate;		mBitErrorRate = s.mBitErrorRate;
	mTimingAdvance = s.mTimingAdvance;		mTimingAdvance = s.mTimingAdvance;
	}		}

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

telephony/java/android/telephony/CellSignalStrengthLte.java

+8 −58

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

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

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

	/**
	* 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;
	mRsrp = rsrp;		mRsrp = rsrp;
	mRsrq = rsrq;		mRsrq = rsrq;
	mRssnr = rssnr;		mRssnr = rssnr;
	@@ -88,25 +53,12 @@ public final class CellSignalStrengthLte extends CellSignalStrength implements P
	mTimingAdvance = timingAdvance;		mTimingAdvance = timingAdvance;
	}		}

	/**		/** @hide */
	* Initialize from the SignalStrength structure.		public CellSignalStrengthLte(CellSignalStrengthLte s) {
	*		copyFrom(s);
	* @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 */
	* @hide
	*/
	protected void copyFrom(CellSignalStrengthLte s) {		protected void copyFrom(CellSignalStrengthLte s) {
	mSignalStrength = s.mSignalStrength;		mSignalStrength = s.mSignalStrength;
	mRsrp = s.mRsrp;		mRsrp = s.mRsrp;
	@@ -116,9 +68,7 @@ public final class CellSignalStrengthLte extends CellSignalStrength implements P
	mTimingAdvance = s.mTimingAdvance;		mTimingAdvance = s.mTimingAdvance;
	}		}

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

telephony/java/android/telephony/CellSignalStrengthWcdma.java

+9 −39

Original line number	Original line	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_GOOD = 8;
	private static final int WCDMA_SIGNAL_STRENGTH_MODERATE = 5;		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		private int mBitErrorRate; // bit error rate (0-7, 99) as defined in TS 27.007 8.5

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

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

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

	/**		/** @hide */
	* 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
	*/
	protected void copyFrom(CellSignalStrengthWcdma s) {		protected void copyFrom(CellSignalStrengthWcdma s) {
	mSignalStrength = s.mSignalStrength;		mSignalStrength = s.mSignalStrength;
	mBitErrorRate = s.mBitErrorRate;		mBitErrorRate = s.mBitErrorRate;
	}		}

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