diff options
Diffstat (limited to 'telephony/java/android')
9 files changed, 69 insertions, 18 deletions
diff --git a/telephony/java/android/telephony/CellIdentityCdma.java b/telephony/java/android/telephony/CellIdentityCdma.java index 6e2a70d..31e01c0 100644 --- a/telephony/java/android/telephony/CellIdentityCdma.java +++ b/telephony/java/android/telephony/CellIdentityCdma.java @@ -162,13 +162,13 @@ public final class CellIdentityCdma implements Parcelable { @Override public String toString() { - StringBuilder sb = new StringBuilder("CdmaCellIdentitiy:"); - sb.append(super.toString()); + StringBuilder sb = new StringBuilder("CellIdentitiyCdma:{"); sb.append(" mNetworkId="); sb.append(mNetworkId); sb.append(" mSystemId="); sb.append(mSystemId); sb.append(" mBasestationId="); sb.append(mBasestationId); sb.append(" mLongitude="); sb.append(mLongitude); sb.append(" mLatitude="); sb.append(mLatitude); + sb.append("}"); return sb.toString(); } diff --git a/telephony/java/android/telephony/CellIdentityGsm.java b/telephony/java/android/telephony/CellIdentityGsm.java index bda96be..98113e7 100644 --- a/telephony/java/android/telephony/CellIdentityGsm.java +++ b/telephony/java/android/telephony/CellIdentityGsm.java @@ -147,13 +147,13 @@ public final class CellIdentityGsm implements Parcelable { @Override public String toString() { - StringBuilder sb = new StringBuilder("GsmCellIdentitiy:"); - sb.append(super.toString()); + StringBuilder sb = new StringBuilder("CellIdentitiyGsm:{"); sb.append(" mMcc=").append(mMcc); - sb.append(" mMnc=").append(mMcc); + sb.append(" mMnc=").append(mMnc); sb.append(" mLac=").append(mLac); sb.append(" mCid=").append(mCid); sb.append(" mPsc=").append(mPsc); + sb.append("}"); return sb.toString(); } diff --git a/telephony/java/android/telephony/CellIdentityLte.java b/telephony/java/android/telephony/CellIdentityLte.java index f72d583..86924bd 100644 --- a/telephony/java/android/telephony/CellIdentityLte.java +++ b/telephony/java/android/telephony/CellIdentityLte.java @@ -142,13 +142,13 @@ public final class CellIdentityLte implements Parcelable { @Override public String toString() { - StringBuilder sb = new StringBuilder("LteCellIdentitiy:"); - sb.append(super.toString()); + StringBuilder sb = new StringBuilder("CellIdentitiyLte:{"); sb.append(" mMcc="); sb.append(mMcc); sb.append(" mMnc="); sb.append(mMnc); sb.append(" mCi="); sb.append(mCi); sb.append(" mPci="); sb.append(mPci); sb.append(" mTac="); sb.append(mTac); + sb.append("}"); return sb.toString(); } diff --git a/telephony/java/android/telephony/CellInfo.java b/telephony/java/android/telephony/CellInfo.java index f367f99..fe3c68b 100644 --- a/telephony/java/android/telephony/CellInfo.java +++ b/telephony/java/android/telephony/CellInfo.java @@ -149,7 +149,7 @@ public abstract class CellInfo implements Parcelable { StringBuffer sb = new StringBuffer(); String timeStampType; - sb.append(" mRegistered=").append(mRegistered ? "YES" : "NO"); + sb.append("mRegistered=").append(mRegistered ? "YES" : "NO"); timeStampType = timeStampTypeToString(mTimeStampType); sb.append(" mTimeStampType=").append(timeStampType); sb.append(" mTimeStamp=").append(mTimeStamp).append("ns"); diff --git a/telephony/java/android/telephony/CellInfoCdma.java b/telephony/java/android/telephony/CellInfoCdma.java index a5d6e9c..6f2f1f6 100644 --- a/telephony/java/android/telephony/CellInfoCdma.java +++ b/telephony/java/android/telephony/CellInfoCdma.java @@ -87,10 +87,11 @@ public final class CellInfoCdma extends CellInfo implements Parcelable { public String toString() { StringBuffer sb = new StringBuffer(); - sb.append("CellInfoCdma:"); + sb.append("CellInfoCdma:{"); sb.append(super.toString()); - sb.append(", ").append(mCellIdentityCdma); - sb.append(", ").append(mCellSignalStrengthCdma); + sb.append(" ").append(mCellIdentityCdma); + sb.append(" ").append(mCellSignalStrengthCdma); + sb.append("}"); return sb.toString(); } diff --git a/telephony/java/android/telephony/CellInfoGsm.java b/telephony/java/android/telephony/CellInfoGsm.java index bf0eca8..1bedddb 100644 --- a/telephony/java/android/telephony/CellInfoGsm.java +++ b/telephony/java/android/telephony/CellInfoGsm.java @@ -87,10 +87,11 @@ public final class CellInfoGsm extends CellInfo implements Parcelable { public String toString() { StringBuffer sb = new StringBuffer(); - sb.append("CellInfoGsm:"); + sb.append("CellInfoGsm:{"); sb.append(super.toString()); - sb.append(", ").append(mCellIdentityGsm); - sb.append(", ").append(mCellSignalStrengthGsm); + sb.append(" ").append(mCellIdentityGsm); + sb.append(" ").append(mCellSignalStrengthGsm); + sb.append("}"); return sb.toString(); } diff --git a/telephony/java/android/telephony/CellInfoLte.java b/telephony/java/android/telephony/CellInfoLte.java index d7a58b6..287c9f0 100644 --- a/telephony/java/android/telephony/CellInfoLte.java +++ b/telephony/java/android/telephony/CellInfoLte.java @@ -91,10 +91,11 @@ public final class CellInfoLte extends CellInfo implements Parcelable { public String toString() { StringBuffer sb = new StringBuffer(); - sb.append("CellInfoLte:"); + sb.append("CellInfoLte:{"); sb.append(super.toString()); - sb.append(", ").append(mCellIdentityLte); - sb.append(", ").append(mCellSignalStrengthLte); + sb.append(" ").append(mCellIdentityLte); + sb.append(" ").append(mCellSignalStrengthLte); + sb.append("}"); return sb.toString(); } diff --git a/telephony/java/android/telephony/SignalStrength.java b/telephony/java/android/telephony/SignalStrength.java index 3ed9cef..674955c 100644 --- a/telephony/java/android/telephony/SignalStrength.java +++ b/telephony/java/android/telephony/SignalStrength.java @@ -274,6 +274,33 @@ public class SignalStrength implements Parcelable { } /** + * Make a SignalStrength object from the given parcel as passed up by + * the ril which does not have isGsm. isGsm will be changed by ServiceStateTracker + * so the default is a don't care. + * + * @hide + */ + public static SignalStrength makeSignalStrengthFromRilParcel(Parcel in) { + if (DBG) log("Size of signalstrength parcel:" + in.dataSize()); + + SignalStrength ss = new SignalStrength(); + ss.mGsmSignalStrength = in.readInt(); + ss.mGsmBitErrorRate = in.readInt(); + ss.mCdmaDbm = in.readInt(); + ss.mCdmaEcio = in.readInt(); + ss.mEvdoDbm = in.readInt(); + ss.mEvdoEcio = in.readInt(); + ss.mEvdoSnr = in.readInt(); + ss.mLteSignalStrength = in.readInt(); + ss.mLteRsrp = in.readInt(); + ss.mLteRsrq = in.readInt(); + ss.mLteRssnr = in.readInt(); + ss.mLteCqi = in.readInt(); + + return ss; + } + + /** * {@link Parcelable#writeToParcel} */ public void writeToParcel(Parcel out, int flags) { diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 4aee902..6400e68 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -1341,7 +1341,8 @@ public class TelephonyManager { } /** - * Returns all observed cell information of the device. + * Returns all observed cell information of the device. This does + * not cause or change the rate of PhoneStateListner#onCellInfoChanged. * * @return List of CellInfo or null if info unavailable. * @@ -1357,4 +1358,24 @@ public class TelephonyManager { return null; } } + + /** + * Sets the minimum time in milli-seconds between {@link PhoneStateListener#onCellInfoChanged + * PhoneStateListener.onCellInfoChanged} will be invoked. + * + * The default, 0, means invoke onCellInfoChanged when any of the reported + * information changes. Setting the value to INT_MAX(0x7fffffff) means never issue + * A onCellInfoChanged. + * + * @param rateInMillis the rate + * + * @hide + */ + public void setCellInfoListRate(int rateInMillis) { + try { + getITelephony().setCellInfoListRate(rateInMillis); + } catch (RemoteException ex) { + } catch (NullPointerException ex) { + } + } } |