diff options
Diffstat (limited to 'telephony/java/android/telephony/SignalStrength.java')
-rw-r--r--[-rwxr-xr-x] | telephony/java/android/telephony/SignalStrength.java | 123 |
1 files changed, 102 insertions, 21 deletions
diff --git a/telephony/java/android/telephony/SignalStrength.java b/telephony/java/android/telephony/SignalStrength.java index 4671310..3ed9cef 100755..100644 --- a/telephony/java/android/telephony/SignalStrength.java +++ b/telephony/java/android/telephony/SignalStrength.java @@ -1,6 +1,5 @@ /* - * Copyright (C) 2009 Qualcomm Innovation Center, Inc. All Rights Reserved. - * Copyright (C) 2009 The Android Open Source Project + * Copyright (C) 2012 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +19,7 @@ package android.telephony; import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; -import android.util.Log; +import android.telephony.Rlog; /** * Contains phone signal strength related information. @@ -65,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 * @@ -137,20 +137,10 @@ public class SignalStrength implements Parcelable { int cdmaDbm, int cdmaEcio, int evdoDbm, int evdoEcio, int evdoSnr, int lteSignalStrength, int lteRsrp, int lteRsrq, int lteRssnr, int lteCqi, - boolean gsm) { - mGsmSignalStrength = gsmSignalStrength; - mGsmBitErrorRate = gsmBitErrorRate; - mCdmaDbm = cdmaDbm; - mCdmaEcio = cdmaEcio; - mEvdoDbm = evdoDbm; - mEvdoEcio = evdoEcio; - mEvdoSnr = evdoSnr; - mLteSignalStrength = lteSignalStrength; - mLteRsrp = lteRsrp; - mLteRsrq = lteRsrq; - mLteRssnr = lteRssnr; - mLteCqi = lteCqi; - isGsm = gsm; + boolean gsmFlag) { + initialize(gsmSignalStrength, gsmBitErrorRate, cdmaDbm, cdmaEcio, + evdoDbm, evdoEcio, evdoSnr, lteSignalStrength, lteRsrp, + lteRsrq, lteRssnr, lteCqi, gsmFlag); } /** @@ -161,9 +151,10 @@ public class SignalStrength implements Parcelable { public SignalStrength(int gsmSignalStrength, int gsmBitErrorRate, int cdmaDbm, int cdmaEcio, int evdoDbm, int evdoEcio, int evdoSnr, - boolean gsm) { - this(gsmSignalStrength, gsmBitErrorRate, cdmaDbm, cdmaEcio, evdoDbm, evdoEcio, evdoSnr, 99, - INVALID, INVALID, INVALID, INVALID, gsm); + boolean gsmFlag) { + initialize(gsmSignalStrength, gsmBitErrorRate, cdmaDbm, cdmaEcio, + evdoDbm, evdoEcio, evdoSnr, 99, INVALID, + INVALID, INVALID, INVALID, gsmFlag); } /** @@ -178,6 +169,69 @@ public class SignalStrength implements Parcelable { } /** + * 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, + boolean gsm) { + mGsmSignalStrength = gsmSignalStrength; + mGsmBitErrorRate = gsmBitErrorRate; + mCdmaDbm = cdmaDbm; + mCdmaEcio = cdmaEcio; + mEvdoDbm = evdoDbm; + mEvdoEcio = evdoEcio; + mEvdoSnr = evdoSnr; + mLteSignalStrength = lteSignalStrength; + mLteRsrp = lteRsrp; + mLteRsrq = lteRsrq; + mLteRssnr = lteRssnr; + mLteCqi = lteCqi; + isGsm = gsm; + if (DBG) log("initialize: " + toString()); + } + + /** * @hide */ protected void copyFrom(SignalStrength s) { @@ -202,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(); @@ -354,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 * @@ -838,6 +919,6 @@ public class SignalStrength implements Parcelable { * log */ private static void log(String s) { - Log.w(LOG_TAG, s); + Rlog.w(LOG_TAG, s); } } |